svn commit: r302790 - head/usr.sbin/bsdinstall/scripts

[Nathan Whitehorn]

Can you please make this dialog default to "skip" for people with 
systems where the time is set correctly? I realize "OK" is usually a 
no-op, so the "just press enter" is maintained, but "skip" is even more 
of a no-op.
-Nathan

On 07/13/16 16:49, Allan Jude wrote:
> Author: allanjude
> Date: Wed Jul 13 23:49:45 2016
> New Revision: 302790
> URL: https://svnweb.freebsd.org/changeset/base/302790
>
> Log:
>    bsdinstall: Prompt user to set the date and time after selecting timezone
>    
>    Not having the correct date and time makes many PKI based things not work
>    
>    In 10 and 11, it can mean that Unbound, ntpd, and sshd won't start
>    
>    Submitted by:	des (original patch)
>    MFC after:	7 days
>
> Modified:
>    head/usr.sbin/bsdinstall/scripts/time
>
> Modified: head/usr.sbin/bsdinstall/scripts/time
> ==============================================================================
> --- head/usr.sbin/bsdinstall/scripts/time	Wed Jul 13 23:03:34 2016	(r302789)
> +++ head/usr.sbin/bsdinstall/scripts/time	Wed Jul 13 23:49:45 2016	(r302790)
> @@ -26,4 +26,40 @@
>   #
>   # $FreeBSD$
>   
> +# Select timezone
>   chroot $BSDINSTALL_CHROOT tzsetup
> +
> +# Switch to target timezone
> +saved_TZ="$TZ"
> +TZ="${BSDINSTALL_CHROOT}/etc/localtime"
> +export TZ
> +
> +# Set date
> +exec 3>&1
> +DATE=$(dialog --backtitle 'FreeBSD Installer' \
> +	--title 'Time & Date' \
> +	--ok-label 'Set Date' \
> +	--cancel-label 'Skip' \
> +	--date-format '%Y%m%d%H%M.%S' \
> +	--calendar '' 2 40 \
> +2>&1 1>&3) && date $DATE
> +exec 3>&-
> +
> +# Set time
> +exec 3>&1
> +TIME=$(dialog --backtitle 'FreeBSD Installer' \
> +	--title 'Time & Date' \
> +	--ok-label 'Set Time' \
> +	--cancel-label 'Skip' \
> +	--time-format '%H%M.%S' \
> +	--timebox '' 2 40 \
> +2>&1 1>&3) && date $TIME
> +exec 3>&-
> +
> +# Switch back
> +if [ -n "$saved_TZ" ]; then
> +	TZ="$saved_TZ"
> +else
> +	unset TZ
> +fi
> +unset saved_TZ
>