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

[Nathan Whitehorn]

Author: nwhitehorn
Date: Fri Jan 28 14:47:09 2011
New Revision: 218017
URL: http://svn.freebsd.org/changeset/base/218017

Log:
  Write rc.conf sections from various configuration steps into separate
  files and then join them and the end. This will allow the introduction
  of a 'Back' button or equivalent functionality.

Modified:
  user/nwhitehorn/bsdinstall/scripts/config
  user/nwhitehorn/bsdinstall/scripts/hostname
  user/nwhitehorn/bsdinstall/scripts/keymap
  user/nwhitehorn/bsdinstall/scripts/netconfig
  user/nwhitehorn/bsdinstall/scripts/services

Modified: user/nwhitehorn/bsdinstall/scripts/config
==============================================================================
--- user/nwhitehorn/bsdinstall/scripts/config	Fri Jan 28 13:48:22 2011	(r218016)
+++ user/nwhitehorn/bsdinstall/scripts/config	Fri Jan 28 14:47:09 2011	(r218017)
@@ -1,3 +1,6 @@
 #!/bin/sh
 
+cat $BSDINSTALL_TMPETC/rc.conf.* >> $BSDINSTALL_TMPETC/rc.conf
+rm $BSDINSTALL_TMPETC/rc.conf.*
+
 cp $BSDINSTALL_TMPETC/* $BSDINSTALL_CHROOT/etc

Modified: user/nwhitehorn/bsdinstall/scripts/hostname
==============================================================================
--- user/nwhitehorn/bsdinstall/scripts/hostname	Fri Jan 28 13:48:22 2011	(r218016)
+++ user/nwhitehorn/bsdinstall/scripts/hostname	Fri Jan 28 14:47:09 2011	(r218017)
@@ -16,7 +16,7 @@ If you are running on a managed network,
 if [ $? -eq $DIALOG_CANCEL ]; then exit 1; fi
 exec 3>&-
 
-echo "hostname=\"$HOSTNAME\"" >> $BSDINSTALL_TMPETC/rc.conf
+echo "hostname=\"$HOSTNAME\"" > $BSDINSTALL_TMPETC/rc.conf.hostname
 if [ ! -z $BSDINSTALL_CONFIGCURRENT ]; then
 	hostname -s "$HOSTNAME"
 fi

Modified: user/nwhitehorn/bsdinstall/scripts/keymap
==============================================================================
--- user/nwhitehorn/bsdinstall/scripts/keymap	Fri Jan 28 13:48:22 2011	(r218016)
+++ user/nwhitehorn/bsdinstall/scripts/keymap	Fri Jan 28 14:47:09 2011	(r218017)
@@ -2,5 +2,5 @@
 
 kbdcontrol -d >/dev/null 2>&1
 if [ $? -eq 0 ]; then
-	kbdmap 3>&2 2>&1 1>&3 | grep 'keymap=' >> $BSDINSTALL_TMPETC/rc.conf
+	kbdmap 3>&2 2>&1 1>&3 | grep 'keymap=' > $BSDINSTALL_TMPETC/rc.conf.keymap
 fi

Modified: user/nwhitehorn/bsdinstall/scripts/netconfig
==============================================================================
--- user/nwhitehorn/bsdinstall/scripts/netconfig	Fri Jan 28 13:48:22 2011	(r218016)
+++ user/nwhitehorn/bsdinstall/scripts/netconfig	Fri Jan 28 14:47:09 2011	(r218017)
@@ -10,6 +10,8 @@ DIALOG_TAGS=""
 : ${DIALOG_ITEM_HELP=4}
 : ${DIALOG_ESC=255}
 
+echo -n > $BSDINSTALL_TMPETC/rc.conf.net
+
 for IF in `ifconfig -l`; do
 	if [ $IF != "lo0" ]; then
 		INTERFACES="$INTERFACES $IF"
@@ -25,7 +27,7 @@ exec 3>&-
 
 dialog --backtitle 'FreeBSD Installer' --title 'Network Configuration' --yesno 'Would you like to use DHCP to configure this interface?' 0 0
 if [ $? -eq $DIALOG_OK ]; then
-	echo ifconfig_$INTERFACE=\"DHCP\" >> $BSDINSTALL_TMPETC/rc.conf
+	echo ifconfig_$INTERFACE=\"DHCP\" >> $BSDINSTALL_TMPETC/rc.conf.net
 
 	if [ ! -z $BSDINSTALL_CONFIGCURRENT ]; then
 		dialog --backtitle 'FreeBSD Installer' --infobox "Acquiring DHCP lease..." 0 0
@@ -58,10 +60,10 @@ echo $INTERFACE $IF_CONFIG | 
     awk '{
 	printf("ifconfig_%s=\"%s netmask %s\"\n", $1, $2, $3);
 	printf("defaultrouter=\"%s\"\n", $4);
-    }' >> $BSDINSTALL_TMPETC/rc.conf
+    }' >> $BSDINSTALL_TMPETC/rc.conf.net
 
 if [ ! -z $BSDINSTALL_CONFIGCURRENT ]; then
-	. $BSDINSTALL_TMPETC/rc.conf
+	. $BSDINSTALL_TMPETC/rc.conf.net
 	ifconfig $INTERFACE `eval echo \\\$ifconfig_$INTERFACE`
 	route delete default
 	route add default $defaultrouter

Modified: user/nwhitehorn/bsdinstall/scripts/services
==============================================================================
--- user/nwhitehorn/bsdinstall/scripts/services	Fri Jan 28 13:48:22 2011	(r218016)
+++ user/nwhitehorn/bsdinstall/scripts/services	Fri Jan 28 14:47:09 2011	(r218017)
@@ -12,6 +12,6 @@ DAEMONS=$(dialog --backtitle "FreeBSD In
 exec 3>&-
 
 for daemon in $DAEMONS; do
-	echo ${daemon}_enable=\"YES\" >> $BSDINSTALL_TMPETC/rc.conf
+	echo ${daemon}_enable=\"YES\" >> $BSDINSTALL_TMPETC/rc.conf.services
 done