Changeset 3995

Timestamp:

05/28/09 11:45:17 (10 months ago)

Author:

kris

Message:

Update install scripts to fix ZFS detection when doing upgrades

Still needs some work though ;)

Location:

pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts

Files:

• PCBSD.MountUpgrade.sh (modified) (1 diff)
• PCBSD.SysConfig.sh (modified) (1 diff)

pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.MountUpgrade.sh

@@ -16 +16 @@
   fsck -y ${PART}a >/dev/null 2>/dev/null
   mount ${PART}a ${FSMNT}${MNT} >/dev/null 2>/dev/null
+fi
+
+# Check if this is a ZFS boot partition
+cat ${FSMNT}/boot/loader.conf | grep '^vfs.root.mountfrom="zfs:' >/dev/null 2>/dev/null
+if [ "$?" = "0" ]
+then
+  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}
+
+  # Now mount the root partition for ZFS
+  mount -t zfs ${ZROOT}/root ${FSMNT}
+
+  # Mount the bootdir now
+  mount ${PART}a ${FSMNT}/bootdir
+  echo "${ZROOT}" > /tmp/upgradeZFS
 fi
 

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

@@ -240 +240 @@
   done
 
+  if [ -e "/tmp/upgradeZFS" ]
+  then
+    ZROOT=`cat /tmp/upgradeZFS`
+    umount ${FSMNT}/bootdir
+  fi
+
   umount -f ${FSMNT} >/dev/null
+
+  if [ ! -z "${ZROOT}" ]
+  then
+    zpool export -f ${ZROOT}
+  fi
 
 fi