socsvn commit: r278260 - in soc2014/kczekirda/pxe-fai-head: head/usr.sbin/bsdinstall/scripts tools/mfsbsd/customfiles/usr/libexec/bsdinstall

[kczekirda at FreeBSD.org]

Author: kczekirda
Date: Thu Mar 12 13:40:00 2015
New Revision: 278260
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=278260

Log:
  add support for script after configuration

Modified:
  soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts/script
  soc2014/kczekirda/pxe-fai-head/tools/mfsbsd/customfiles/usr/libexec/bsdinstall/script

Modified: soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts/script
==============================================================================
--- soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts/script	Thu Mar 12 13:39:48 2015	(r278259)
+++ soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts/script	Thu Mar 12 13:40:00 2015	(r278260)
@@ -111,6 +111,10 @@
 
 split -a 2 -p '^#!.*' "$SCRIPT" /tmp/bsdinstall-installscript-
 
+if [ -f /tmp/bsdinstall-installscript-ab ]; then
+	mv /tmp/bsdinstall-installscript-ab /tmp/bsdinstall-installscript
+fi
+
 . /tmp/bsdinstall-installscript-aa
 : ${DISTRIBUTIONS="kernel.txz base.txz"}; export DISTRIBUTIONS
 export BSDINSTALL_DISTDIR
@@ -303,9 +307,15 @@
 
 # Run post-install script
 if [ -f /tmp/bsdinstall-installscript-ab ]; then
-	echo "rm /etc/rc.local" >> /tmp/bsdinstall-installscript-ab
+	if [ -f /tmp/bsdinstall-installscript ]; then
+		echo "rm /etc/rc.local" >> /tmp/bsdinstall-installscript
+		echo "mv /etc/rc.script /etc/rc.local" >> /tmp/bsdinstall-installscript-ab
+	else
+		echo "rm /etc/rc.local" >> /tmp/bsdinstall-installscript-ab
+	fi
 	echo "reboot" >> /tmp/bsdinstall-installscript-ab
 	cp /tmp/bsdinstall-installscript-ab $BSDINSTALL_CHROOT/etc/rc.local
+	cp /tmp/bsdinstall-installscript $BSDINSTALL_CHROOT/etc/rc.script
 	chmod a+x $BSDINSTALL_CHROOT/etc/rc.local
 	rm /tmp/bsdinstall-installscript-ab
 fi

Modified: soc2014/kczekirda/pxe-fai-head/tools/mfsbsd/customfiles/usr/libexec/bsdinstall/script
==============================================================================
--- soc2014/kczekirda/pxe-fai-head/tools/mfsbsd/customfiles/usr/libexec/bsdinstall/script	Thu Mar 12 13:39:48 2015	(r278259)
+++ soc2014/kczekirda/pxe-fai-head/tools/mfsbsd/customfiles/usr/libexec/bsdinstall/script	Thu Mar 12 13:40:00 2015	(r278260)
@@ -47,10 +47,10 @@
 : ${MIRROR:=ftp://ftp.freebsd.org}
 # RELEASE default:
 : ${RELEASE:=10.1}
-# HOSTNAME	to TMPETC if not exist, don't set
-# KEYMAP	to TMPETC if not exist, don't set
-# DAEMONS	to TMPETC if not exist, don't set
-# TIMEZONE	to /tmp/bsdinstall-installscript-ab
+# HOSTNAME	if not exist, don't set
+# KEYMAP	if not exist, don't set
+# DAEMONS	if not exist, don't set
+# TIMEZONE
 # INTERFACE 	(em0, bge0)
 # IPV4 		(default: YES)
 : ${IPV4:=YES}
@@ -108,11 +108,13 @@
 shift
 
 f_dprintf "Began Installation at %s" "$( date )"
-rm -rf $BSDINSTALL_TMPETC
-mkdir $BSDINSTALL_TMPETC
 
 split -a 2 -p '^#!.*' "$SCRIPT" /tmp/bsdinstall-installscript-
 
+if [ -f /tmp/bsdinstall-installscript-ab ]; then
+	mv /tmp/bsdinstall-installscript-ab /tmp/bsdinstall-installscript
+fi
+
 . /tmp/bsdinstall-installscript-aa
 : ${DISTRIBUTIONS="kernel.txz base.txz"}; export DISTRIBUTIONS
 export BSDINSTALL_DISTDIR
@@ -261,12 +263,12 @@
 	fi
 	echo "echo ipv6_enable=\\\"YES\\\" >> /etc/rc.conf" >> /tmp/bsdinstall-installscript-ab
 	if [ "$SLAAC" = "YES" ]; then
-		echo "echo \"ifconfig_${INTERFACE}_ipv6=\\\"inet6 accept_rtadv\"\" >> /etc/rc.conf" >> /tmp/bsdinstall-installscript-ab
+		echo "echo ifconfig_${INTERFACE}_ipv6=\\\"inet6 accept_rtadv\\\" >> /etc/rc.conf" >> /tmp/bsdinstall-installscript-ab
 	fi
 
 	if [ "$SLAAC" = "NO" ]; then
-		echo "echo ifconfig_${INTERFACE}_ipv6=\"ineti6 $ADDRESSV6\" >> /etc/rc.conf" >> /tmp/bsdinstall-installscript-ab
-		echo "echo ipv6_defaultrouter=\"$GWV6\" >> $BSDINSTALL_TMPETC/rc.conf" >> /tmp/bsdinstall-installscript-ab
+		echo "echo \"ifconfig_${INTERFACE}_ipv6=\\\"ineti6 $ADDRESSV6\\\"\" >> /etc/rc.conf" >> /tmp/bsdinstall-installscript-ab
+		echo "echo ipv6_defaultrouter=\\\"$GWV6\\\" >> /etc/rc.conf" >> /tmp/bsdinstall-installscript-ab
 	fi
 fi
 
@@ -293,11 +295,6 @@
 fi
 
 # Finalize install
-cat $BSDINSTALL_TMPETC/rc.conf.* >> $BSDINSTALL_TMPETC/rc.conf
-rm $BSDINSTALL_TMPETC/rc.conf.*
-
-cp $BSDINSTALL_TMPETC/* $BSDINSTALL_CHROOT/etc
-
 cat $BSDINSTALL_TMPBOOT/loader.conf.* >> $BSDINSTALL_TMPBOOT/loader.conf
 rm $BSDINSTALL_TMPBOOT/loader.conf.*
 df -t zfs $BSDINSTALL_CHROOT > /dev/null && echo "zfs_load=\"YES\"" >> $BSDINSTALL_TMPBOOT/loader.conf
@@ -310,9 +307,15 @@
 
 # Run post-install script
 if [ -f /tmp/bsdinstall-installscript-ab ]; then
-	echo "rm /etc/rc.local" >> /tmp/bsdinstall-installscript-ab
+	if [ -f /tmp/bsdinstall-installscript ]; then
+		echo "rm /etc/rc.local" >> /tmp/bsdinstall-installscript
+		echo "mv /etc/rc.script /etc/rc.local" >> /tmp/bsdinstall-installscript-ab
+	else
+		echo "rm /etc/rc.local" >> /tmp/bsdinstall-installscript-ab
+	fi
 	echo "reboot" >> /tmp/bsdinstall-installscript-ab
 	cp /tmp/bsdinstall-installscript-ab $BSDINSTALL_CHROOT/etc/rc.local
+	cp /tmp/bsdinstall-installscript $BSDINSTALL_CHROOT/etc/rc.script
 	chmod a+x $BSDINSTALL_CHROOT/etc/rc.local
 	rm /tmp/bsdinstall-installscript-ab
 fi