svn commit: r217111 - user/nwhitehorn/bsdinstall/scripts

[Nathan Whitehorn]

Author: nwhitehorn
Date: Fri Jan  7 16:51:47 2011
New Revision: 217111
URL: http://svn.freebsd.org/changeset/base/217111

Log:
  Split application of configuration and setting up ssh, etc. into two
  scripts and allow the user to set the system time zone by running tzsetup
  in a chroot. The 'time' script could potentially allow setting the system
  clock as well, depending on how fancy we want to get.

Added:
  user/nwhitehorn/bsdinstall/scripts/services
     - copied, changed from r217084, user/nwhitehorn/bsdinstall/scripts/config
  user/nwhitehorn/bsdinstall/scripts/time
Modified:
  user/nwhitehorn/bsdinstall/scripts/auto
  user/nwhitehorn/bsdinstall/scripts/config

Modified: user/nwhitehorn/bsdinstall/scripts/auto
==============================================================================
--- user/nwhitehorn/bsdinstall/scripts/auto	Fri Jan  7 16:47:20 2011	(r217110)
+++ user/nwhitehorn/bsdinstall/scripts/auto	Fri Jan  7 16:51:47 2011	(r217111)
@@ -43,6 +43,8 @@ fi
 
 bsdinstall distextract || error
 bsdinstall rootpass || error
+bsdinstall time || error
+bsdinstall services || error
 bsdinstall adduser || error
 bsdinstall config  || error
 

Modified: user/nwhitehorn/bsdinstall/scripts/config
==============================================================================
--- user/nwhitehorn/bsdinstall/scripts/config	Fri Jan  7 16:47:20 2011	(r217110)
+++ user/nwhitehorn/bsdinstall/scripts/config	Fri Jan  7 16:51:47 2011	(r217111)
@@ -1,20 +1,5 @@
 #!/bin/sh
 
-exec 3>&1
-DAEMONS=$(cdialog --backtitle "FreeBSD Installer" \
-    --title "System Configuration" --nocancel --separate-output \
-    --checklist "Choose the services you would like to be started at boot:" \
-    0 0 0 \
-	sshd	"Secure shell daemon" on \
-	ntpd	"Synchronize system and network time" off \
-	powerd	"Adjust CPU frequency dynamically" off \
-2>&1 1>&3)
-exec 3>&-
-
-for daemon in $DAEMONS; do
-	echo ${daemon}_enable=\"YES\" >> /tmp/rc.conf
-done
-
 cp $PATH_FSTAB $BSDINSTALL_CHROOT/etc/fstab
 cp /tmp/rc.conf $BSDINSTALL_CHROOT/etc/rc.conf
 cp /tmp/resolv.conf $BSDINSTALL_CHROOT/etc/resolv.conf

Copied and modified: user/nwhitehorn/bsdinstall/scripts/services (from r217084, user/nwhitehorn/bsdinstall/scripts/config)
==============================================================================
--- user/nwhitehorn/bsdinstall/scripts/config	Thu Jan  6 22:57:06 2011	(r217084, copy source)
+++ user/nwhitehorn/bsdinstall/scripts/services	Fri Jan  7 16:51:47 2011	(r217111)
@@ -15,6 +15,3 @@ for daemon in $DAEMONS; do
 	echo ${daemon}_enable=\"YES\" >> /tmp/rc.conf
 done
 
-cp $PATH_FSTAB $BSDINSTALL_CHROOT/etc/fstab
-cp /tmp/rc.conf $BSDINSTALL_CHROOT/etc/rc.conf
-cp /tmp/resolv.conf $BSDINSTALL_CHROOT/etc/resolv.conf

Added: user/nwhitehorn/bsdinstall/scripts/time
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/nwhitehorn/bsdinstall/scripts/time	Fri Jan  7 16:51:47 2011	(r217111)
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+chroot $BSDINSTALL_CHROOT tzsetup