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

[svn at pcbsd.org]

Author: kris
Date: 2008-07-23 14:02:46 -0700 (Wed, 23 Jul 2008)
New Revision: 2429

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

A few more fixes to the loader.conf and ZFS config



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 20:38:16 UTC (rev 2428)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SysConfig.sh	2008-07-23 21:02:46 UTC (rev 2429)
@@ -148,13 +148,33 @@
 
   ZFSROOT="`cat /uzip/ZFS-root`"
   echo 'zfs_load="YES"' >> ${FSMNT}/boot/loader.conf
-  echo "vfs.root.mountfrom=\"zfs:${ZFSROOT}\"" >> ${FSMNT}/boot/loader.conf
+  echo "vfs.root.mountfrom=\"zfs:${ZFSROOT}/root\"" >> ${FSMNT}/boot/loader.conf
 
   # Move the kernel to /bootdir so we can bootup properly
   mv -f ${FSMNT}/boot ${FSMNT}/bootdir/
+
   # Create our link to /boot on the ZFS partition
   ln -s /bootdir/boot ${FSMNT}/boot
 
+  #  Set our root partition that it needs not be automounted
+  zfs set mountpoint=legacy ${ZFSROOT}/root
+
+  # Reset our mount points for any extra ZFS partitions
+  cd /uzip/zfsmnts/
+  for i in `ls`
+  do
+    # Only set the mounts on partitions besides root
+    if [ "${i}" != "${ZFSROOT}" ]
+    then
+      zfs set mountpoint=`cat ${i}` ${i}/`cat ${i}`
+    fi
+  done
+
+  cd /
+
+  # Copy over our ZFS cache data
+  cp /boot/zfs/* ${FSMNT}/bootdir/boot/zfs/
+
   # Unmount the /bootdir directory
   umount ${FSMNT}/bootdir
 
@@ -185,11 +205,6 @@
 #  Start resetting all the ZFS partition mountpoints if we need to
 if [ -e "/uzip/ZFS-root" ]
 then
-  cd /uzip/zfsmnts/
-  for i in `ls`
-  do
-    zfs set mountpoint=`cat ${i}` ${i}
-  done
 fi