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

svn at pcbsd.org svn at pcbsd.org
Thu May 28 12:09:28 PDT 2009


Author: kris
Date: 2009-05-28 12:09:27 -0700 (Thu, 28 May 2009)
New Revision: 3996

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

Update our ZFS routines for upgrades, don't need to use -R



Modified: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.FindUpdateParts.sh
===================================================================
--- pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.FindUpdateParts.sh	2009-05-28 18:45:17 UTC (rev 3995)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.FindUpdateParts.sh	2009-05-28 19:09:27 UTC (rev 3996)
@@ -33,7 +33,7 @@
       ZROOT="`cat ${FSMNT}/boot/loader.conf | grep vfs.root.mountfrom | cut -d '=' -f 2 | cut -d ':' -f 2 | cut -d '/' -f 1`"
       umount ${FSMNT}
       # Import the zfs pool now
-      zpool import -f -R /mnt ${ZROOT}
+      zpool import -f ${ZROOT}
 
       # Now mount the root partition for ZFS
       mount -t zfs ${ZROOT}/root ${FSMNT}

Modified: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.MountUpgrade.sh
===================================================================
--- pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.MountUpgrade.sh	2009-05-28 18:45:17 UTC (rev 3995)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.MountUpgrade.sh	2009-05-28 19:09:27 UTC (rev 3996)
@@ -24,7 +24,7 @@
   ZROOT="`cat ${FSMNT}/boot/loader.conf | grep vfs.root.mountfrom | cut -d '=' -f 2 | cut -d ':' -f 2 | cut -d '/' -f 1`"
   umount ${FSMNT}
   # Import the zfs pool now
-  zpool import -f -R /mnt ${ZROOT}
+  zpool import -f ${ZROOT}
 
   # Now mount the root partition for ZFS
   mount -t zfs ${ZROOT}/root ${FSMNT}



More information about the Commits mailing list