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

[svn at pcbsd.org]

Author: kris
Date: 2008-07-23 07:51:26 -0700 (Wed, 23 Jul 2008)
New Revision: 2422

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

Fixed up some more support for ZFS after the install is finished



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 14:44:25 UTC (rev 2421)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SysConfig.sh	2008-07-23 14:51:26 UTC (rev 2422)
@@ -145,6 +145,7 @@
 # Make sure we set any final ZFS options if we need it
 if [ -e "/uzip/ZFS-root" ]
 then
+
   ZFSROOT="`cat /uzip/ZFS-root`"
   echo 'zfs_load="YES"' >> ${FSMNT}/boot/loader.conf
   echo 'vfs.root.mountfrom="zfs:${ZFSROOT}"' >> ${FSMNT}/boot/loader.conf
@@ -154,6 +155,10 @@
   rmdir ${FSMNT}/boot
   # Create our link to /boot on the ZFS partition
   ln -s /bootdir ${FSMNT}/boot
+
+  # Unmount the /bootdir directory
+  umount ${FSMNT}/bootdir
+
 fi
 
 
@@ -178,6 +183,17 @@
 
 umount -f ${FSMNT} >/dev/null
 
+#  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
+
+
 umount ${CDMNT}
 /usr/sbin/cdcontrol -f `cat /tmp/cdmnt` eject