Index: stable/11/usr.sbin/bsdinstall/scripts/time
===================================================================
--- stable/11/usr.sbin/bsdinstall/scripts/time	(revision 303331)
+++ stable/11/usr.sbin/bsdinstall/scripts/time	(revision 303332)
@@ -1,29 +1,67 @@
 #!/bin/sh
 #-
 # Copyright (c) 2011 Nathan Whitehorn
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 # 1. Redistributions of source code must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
 #
 # THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 # ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
 # FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 # DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 # OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 # HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
 # $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' \
+	--defaultno \
+	--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' \
+	--defaultno \
+	--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
Index: stable/11
===================================================================
--- stable/11	(revision 303331)
+++ stable/11	(revision 303332)

Property changes on: stable/11
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r302790,302795