From owner-svn-src-stable@freebsd.org  Tue Jul 26 05:27:28 2016
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1BDC3BA5221;
 Tue, 26 Jul 2016 05:27:28 +0000 (UTC)
 (envelope-from allanjude@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id E0537136A;
 Tue, 26 Jul 2016 05:27:27 +0000 (UTC)
 (envelope-from allanjude@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u6Q5RRBk086853;
 Tue, 26 Jul 2016 05:27:27 GMT (envelope-from allanjude@FreeBSD.org)
Received: (from allanjude@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u6Q5RR1M086852;
 Tue, 26 Jul 2016 05:27:27 GMT (envelope-from allanjude@FreeBSD.org)
Message-Id: <201607260527.u6Q5RR1M086852@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: allanjude set sender to
 allanjude@FreeBSD.org using -f
From: Allan Jude <allanjude@FreeBSD.org>
Date: Tue, 26 Jul 2016 05:27:27 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r303332 - stable/11/usr.sbin/bsdinstall/scripts
X-SVN-Group: stable-11
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>, 
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 26 Jul 2016 05:27:28 -0000

Author: allanjude
Date: Tue Jul 26 05:27:26 2016
New Revision: 303332
URL: https://svnweb.freebsd.org/changeset/base/303332

Log:
  MFC: r302790, r302795
  
  Add new menu to bsdinstall to allow user to set date and time after
  selecting timezone. The 'skip' button is the default selection.
  
  Submitted by:	des
  Approved by:	re (gjb)

Modified:
  stable/11/usr.sbin/bsdinstall/scripts/time
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/usr.sbin/bsdinstall/scripts/time
==============================================================================
--- stable/11/usr.sbin/bsdinstall/scripts/time	Tue Jul 26 05:26:53 2016	(r303331)
+++ stable/11/usr.sbin/bsdinstall/scripts/time	Tue Jul 26 05:27:26 2016	(r303332)
@@ -26,4 +26,42 @@
 #
 # $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