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

[svn at pcbsd.org]

Author: kris
Date: 2009-06-11 08:20:05 -0700 (Thu, 11 Jun 2009)
New Revision: 4095

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

Fixed a bug with zfs upgrade, again. No cookie for Kris today!



Modified: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SysConfig.sh
===================================================================
--- pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SysConfig.sh	2009-06-10 23:13:59 UTC (rev 4094)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SysConfig.sh	2009-06-11 15:20:05 UTC (rev 4095)
@@ -185,19 +185,20 @@
     cp /etc/hostid ${FSMNT}/etc/hostid
   else
     # Lets save the ZFS cache data
-    mkdir /uzip/zfs-save
-    mv ${FSMNT}/bootdir/zfs /uzip/zfs-save/
+    mkdir -p /uzip/zfs-save
+    mv ${FSMNT}/bootdir/boot/zfs /uzip/zfs-save/
   fi
 
   # Move the kernel to /bootdir so we can bootup properly
   rm -rf ${FSMNT}/bootdir/boot >/dev/null 2>/dev/null
   mv -f ${FSMNT}/boot ${FSMNT}/bootdir/
   
+  # If we did an upgrade, move back our ZFS cache data
   if [ -e "/tmp/upgradeZFS" ]
   then
     # Copy back the saved ZFS cache data
     rm -rf ${FSMNT}/bootdir/boot/zfs >/dev/null 2>/dev/null
-    mv /uzip/zfs-save/zfs ${FSMNT}/bootdir/
+    mv /uzip/zfs-save/zfs ${FSMNT}/bootdir/boot/
   fi
 
   # Create our link to /boot on the ZFS partition