[PC-BSD Commits] r2432 - pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts

[svn at pcbsd.org]

Author: kris
Date: 2008-07-23 15:32:48 -0700 (Wed, 23 Jul 2008)
New Revision: 2432

Modified:
   pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SysConfig.sh
Log:

Cleaned up the ZFS script with comments, and added the entry to rc.conf



Modified: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SysConfig.sh
===================================================================
--- pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SysConfig.sh	2008-07-23 22:21:41 UTC (rev 2431)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SysConfig.sh	2008-07-23 22:32:48 UTC (rev 2432)
@@ -142,17 +142,22 @@
 rm ${FSMNT}/tmp/RunOnSys.sh
 
 
-# Make sure we set any final ZFS options if we need it
+# Check if we are installing with ZFS and set it up
 if [ -e "/uzip/ZFS-root" ]
 then
 
   ZFSROOT="`cat /uzip/ZFS-root`"
   BASENAME="`echo $ZFSROOT | cut -d '/' -f 3`"
+
+  # Setup our loader.conf entries for ZFS
   echo 'zfs_load="YES"' >> ${FSMNT}/boot/loader.conf
   echo "vfs.root.mountfrom=\"zfs:${BASENAME}/root\"" >> ${FSMNT}/boot/loader.conf
   echo 'vm.kmem_size="512M"' >>${FSMNT}/boot/loader.conf
   echo 'vm.kmem_size_max="512M"' >>${FSMNT}/boot/loader.conf
 
+  # Enable zfs in /etc/rc.conf
+  echo 'zfs_enable="YES"' >> ${FSMNT}/etc/rc.conf
+
   # Move the kernel to /bootdir so we can bootup properly
   mv -f ${FSMNT}/boot ${FSMNT}/bootdir/