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

[kczekirda at FreeBSD.org]

Author: kczekirda
Date: Sun Aug 17 21:36:31 2014
New Revision: 272576
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=272576

Log:
  zfsboot tofile and some mistakes

Modified:
  soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts/auto
  soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts/netconfig
  soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts/zfsboot

Modified: soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts/auto
==============================================================================
--- soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts/auto	Sun Aug 17 21:36:26 2014	(r272575)
+++ soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts/auto	Sun Aug 17 21:36:31 2014	(r272576)
@@ -278,7 +278,7 @@
     bsdinstall config  || error
 fi
 
-if [ ! -z "$BSDINSTALL_FETCHDEST" && -z "$TOFILE" ]; then
+if [ ! -z "$BSDINSTALL_FETCHDEST" -a -z "$TOFILE" ]; then
 	[ "$BSDINSTALL_FETCHDEST" != "$BSDINSTALL_DISTDIR" ] && \
 	    umount "$BSDINSTALL_DISTDIR"
 	rm -rf "$BSDINSTALL_FETCHDEST"

Modified: soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts/netconfig
==============================================================================
--- soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts/netconfig	Sun Aug 17 21:36:26 2014	(r272575)
+++ soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts/netconfig	Sun Aug 17 21:36:31 2014	(r272576)
@@ -69,7 +69,7 @@
 if [ $? -eq $DIALOG_CANCEL ]; then exit 1; fi
 exec 3>&-
 
-if [ -z "$TOFILE"]; then
+if [ -z "$TOFILE" ]; then
     : > $BSDINSTALL_TMPETC/._rc.conf.net
 else
     echo INTERFACE=\"$INTERFACE\" >> "$TOFILE"

Modified: soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts/zfsboot
==============================================================================
--- soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts/zfsboot	Sun Aug 17 21:36:26 2014	(r272575)
+++ soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts/zfsboot	Sun Aug 17 21:36:31 2014	(r272576)
@@ -1465,6 +1465,43 @@
 			fi
 		fi
 
+        if [ ! -z "$TOFILE" ]; then
+            echo "ZFSBOOT=\"YES\"" >> "$TOFILE"
+            echo "ZFSBOOT_VDEV_TYPE=\"$ZFSBOOT_VDEV_TYPE\"" >> "$TOFILE"
+            echo "ZFSBOOT_DISKS=\"$ZFSBOOT_DISKS\"" >> "$TOFILE"
+            echo "ZFSBOOT_POOL_NAME=\"$ZFSBOOT_POOL_NAME\"" >> "$TOFILE"
+            echo "ZFSBOOT_PARTITION_SCHEME=\"$ZFSBOOT_PARTITION_SCHEME\"" >> "$TOFILE"
+            echo "ZFSBOOT_SWAP_SIZE=\"$ZFSBOOT_SWAP_SIZE\"" >> "$TOFILE"
+            echo "ZFSBOOT_CONFIRM_LAYOUT=" >> "$TOFILE"
+            echo "ZFSBOOT_PRESEED_CONFIRM=\"YES\"" >> "$TOFILE"
+
+            if [ "$ZFSBOOT_GNOP_4K_FORCE_ALIGN" ]; then
+                echo "ZFSBOOT_GNOP_4K_FORCE_ALIGN=\"YES\"" >> "$TOFILE"
+            else
+                echo "ZFSBOOT_GNOP_4K_FORCE_ALIGN=\"NO\"" >> "$TOFILE"
+            fi
+
+            if [ "$ZFSBOOT_GELI_ENCRYPTION" ]; then
+                echo "ZFSBOOT_GELI_ENCRYPTION=\"YES\"" >> "$TOFILE"
+            else
+                echo "ZFSBOOT_GELI_ENCRYPTION=\"NO\"" >> "$TOFILE"
+            fi
+
+            if [ "$ZFSBOOT_SWAP_ENCRYPTION" ]; then
+                echo "ZFSBOOT_SWAP_ENCRYPTION=\"YES\"" >> "$TOFILE"
+            else
+                echo "ZFSBOOT_SWAP_ENCRYPTION=\"NO\"" >> "$TOFILE"
+            fi
+
+            if [ "$ZFSBOOT_SWAP_MIRROR" ]; then
+                echo "ZFSBOOT_SWAP_MIRROR=\"YES\"" >> "$TOFILE"
+            else
+                echo "ZFSBOOT_SWAP_MIRROR=\"NO\"" >> "$TOFILE"
+            fi
+
+            break
+        fi
+
 		#
 		# Last Chance!
 		#