From owner-svn-src-head@freebsd.org  Wed Jul 13 23:49:47 2016
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 37293B98E33;
 Wed, 13 Jul 2016 23:49:47 +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 E9AE71189;
 Wed, 13 Jul 2016 23:49:46 +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 u6DNnkKh012882;
 Wed, 13 Jul 2016 23:49:46 GMT (envelope-from allanjude@FreeBSD.org)
Received: (from allanjude@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u6DNnknJ012881;
 Wed, 13 Jul 2016 23:49:46 GMT (envelope-from allanjude@FreeBSD.org)
Message-Id: <201607132349.u6DNnknJ012881@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: Wed, 13 Jul 2016 23:49:46 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r302790 - head/usr.sbin/bsdinstall/scripts
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 13 Jul 2016 23:49:47 -0000

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