socsvn commit: r278259 - soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts

[kczekirda at FreeBSD.org]

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

Log:
  TMPETC unnecessary and ipv6 fixes

Modified:
  soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts/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:39 2015	(r278258)
+++ soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts/script	Thu Mar 12 13:39:48 2015	(r278259)
@@ -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,8 +108,6 @@
 shift
 
 f_dprintf "Began Installation at %s" "$( date )"
-rm -rf $BSDINSTALL_TMPETC
-mkdir $BSDINSTALL_TMPETC
 
 split -a 2 -p '^#!.*' "$SCRIPT" /tmp/bsdinstall-installscript-
 
@@ -261,12 +259,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 +291,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