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

[svn at pcbsd.org]

Author: kris
Date: 2008-08-08 07:56:54 -0700 (Fri, 08 Aug 2008)
New Revision: 2564

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

Further cleanup of the ZFS unmounting, should cleanly unmount everything and
then copy over the ZFS cache information to disk now



Modified: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.MountDisk.sh
===================================================================
--- pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.MountDisk.sh	2008-08-08 14:49:21 UTC (rev 2563)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.MountDisk.sh	2008-08-08 14:56:54 UTC (rev 2564)
@@ -53,6 +53,7 @@
 
   # Mount partition "a" which is UFS to our mount /bootdir
   mount -o rw${MNTOPTS} ${ROOTPART}a${EXTENSION} ${FSMNT}/bootdir
+  echo "${ROOTPART}a" >/uzip/ZFS-bootpart
 
   # Create the FSTAB file
   echo "# Device                Mountpoint      FStype  Options         Dump    Pass#

Modified: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SysConfig.sh
===================================================================
--- pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SysConfig.sh	2008-08-08 14:49:21 UTC (rev 2563)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SysConfig.sh	2008-08-08 14:56:54 UTC (rev 2564)
@@ -148,6 +148,7 @@
 
   ZFSROOT="`cat /uzip/ZFS-root`"
   BASENAME="`echo $ZFSROOT | cut -d '/' -f 3`"
+  ZFSBOOTPART="`cat /uzip/ZFS-bootpart`"
 
   # Setup our loader.conf entries for ZFS
   echo 'zfs_load="YES"' >> ${FSMNT}/boot/loader.conf
@@ -164,8 +165,6 @@
   # 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/
@@ -180,12 +179,21 @@
   done
 
   cd /
+  
+  # Unmount the /bootdir directory
+  umount ${FSMNT}/bootdir
 
+  #  Set our root partition that it needs not be automounted
+  zfs set mountpoint=legacy ${ZFSROOT}/root
+
+  # Remount the bootdir to /mnt
+  mount ${ZFSBOOTPART} ${FSMNT}
+
   # Copy over our ZFS cache data
-  cp /boot/zfs/* ${FSMNT}/bootdir/boot/zfs/
+  cp /boot/zfs/* ${FSMNT}/boot/zfs/
 
-  # Unmount the /bootdir directory
-  umount ${FSMNT}/bootdir
+  # Unmount the /bootdir partition again
+  umount ${FSMNT}
 
 fi