socsvn commit: r271862 - in soc2014/kczekirda/pxe-fai-head: head/usr.sbin/bsdinstall/scripts others

[kczekirda at FreeBSD.org]

Author: kczekirda
Date: Mon Aug  4 19:11:28 2014
New Revision: 271862
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=271862

Log:
  services and distributions

Modified:
  soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts/auto
  soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts/services
  soc2014/kczekirda/pxe-fai-head/others/template.input

Modified: soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts/auto
==============================================================================
--- soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts/auto	Mon Aug  4 19:11:22 2014	(r271861)
+++ soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts/auto	Mon Aug  4 19:11:28 2014	(r271862)
@@ -74,6 +74,7 @@
 	for dist in $EXTRA_DISTS; do
 		export DISTRIBUTIONS="$DISTRIBUTIONS $dist.txz"
 	done
+    [ -n $TOFILE ] && echo "DISTRIBUTIONS=\"$DISTRIBUTIONS\"" >> $TOFILE
 fi
 
 FETCH_DISTRIBUTIONS=""
@@ -84,7 +85,7 @@
 done
 FETCH_DISTRIBUTIONS=`echo $FETCH_DISTRIBUTIONS`	# Trim white space
 
-if [ -n "$FETCH_DISTRIBUTIONS" -a -n "$BSDINSTALL_CONFIGCURRENT" ]; then
+if [ -n "$FETCH_DISTRIBUTIONS" -a -n "$BSDINSTALL_CONFIGCURRENT" -z $TOFILE ]; then
 	dialog --backtitle "FreeBSD Installer" --title "Network Installation" --msgbox "No installation files were found on the boot volume. The next few screens will allow you to configure networking so that they can be downloaded from the Internet." 0 0
 	bsdinstall netconfig || error
 	NETCONFIG_DONE=yes

Modified: soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts/services
==============================================================================
--- soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts/services	Mon Aug  4 19:11:22 2014	(r271861)
+++ soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts/services	Mon Aug  4 19:11:28 2014	(r271862)
@@ -53,15 +53,24 @@
 exec 3>&-
 
 havedump=
-for daemon in $DAEMONS; do
-	[ "$daemon" = "dumpdev" ] && havedump=1 continue
-	echo ${daemon}_enable=\"YES\" >> $BSDINSTALL_TMPETC/rc.conf.services
-done
+
+if [ -z $TOFILE ]; then
+    for daemon in $DAEMONS; do
+        [ "$daemon" = "dumpdev" ] && havedump=1 continue
+        echo ${daemon}_enable=\"YES\" >> $BSDINSTALL_TMPETC/rc.conf.services
+    done
+else
+    for daemon in $DAEMONS; do
+        DAEMONLIST="$DAEMONLIST $daemon"
+    done
+    echo "DAEMONS=\"$DAEMONLIST\"" >> $TOFILE
+fi
 
 echo '# Set dumpdev to "AUTO" to enable crash dumps, "NO"' \
      'to disable' >> $BSDINSTALL_TMPETC/rc.conf.services
 if [ "$havedump" ]; then
-	echo dumpdev=\"AUTO\" >> $BSDINSTALL_TMPETC/rc.conf.services
+    [ -z "$TOFILE" ] && echo dumpdev=\"AUTO\" >> $BSDINSTALL_TMPETC/rc.conf.services
 else
-	echo dumpdev=\"NO\" >> $BSDINSTALL_TMPETC/rc.conf.services
+    [ -z "$TOFILE" ] && echo dumpdev=\"NO\" >> $BSDINSTALL_TMPETC/rc.conf.services
 fi
+

Modified: soc2014/kczekirda/pxe-fai-head/others/template.input
==============================================================================
--- soc2014/kczekirda/pxe-fai-head/others/template.input	Mon Aug  4 19:11:22 2014	(r271861)
+++ soc2014/kczekirda/pxe-fai-head/others/template.input	Mon Aug  4 19:11:28 2014	(r271862)
@@ -3,13 +3,13 @@
 MIRROR="ftp://ftp.pl.freebsd.org/"
 RELDIR="snapshots"
 RELEASE="11.0-CURRENT"
+TIMEZONE="Europe/Warsaw"
+DAEMONS="sshd dumpdev"
+DISTRIBUTIONS="kernel.txz base.txz"
 
 ZFSBOOT="YES"
 ZFSPRESSED="/root/zfspressed"
 #PARTITIONS="ada1 { auto freebsd-ufs /}"
-DISTRIBUTIONS="kernel.txz base.txz"
-TIMEZONE="Europe/Warsaw"
-DAEMONS="sshd dumpdev"
 INTERFACE="em0"
 IPV4="YES"
 DHCP="NO"