Changeset 3997

Timestamp:

05/28/09 12:20:29 (10 months ago)

Author:

kris

Message:

Fixed up ZFS. Should work for upgrades now. Needs testing with more than 1 ZFS partition still though

Location:

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

Files:

• PCBSD.FindUpdateParts.sh (modified) (1 diff)
• PCBSD.MountUpgrade.sh (modified) (1 diff)
• PCBSD.SysConfig.sh (modified) (2 diffs)

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

@@ -104 +104 @@
     fi # End of if /mnt/PCBSD
 
+    # If we are on ZFS, cleanup after the mount
     if [ ! -z "${ZROOT}" ]
     then
       umount ${FSMNT}/bootdir
+      /bin/sh /tmp/TempUMount
+      umount ${FSMNT}
+      rm /tmp/TempUMount
+
+      # Remount the bootdir to /mnt
+      mount ${PART}a ${FSMNT}
+
+      # Copy over our ZFS cache data
+      cp /boot/zfs/* ${FSMNT}/boot/zfs/
+
+      # Unmount the /bootdir partition again
+      umount ${FSMNT}
+    else
+      # Unmount FS
+      /bin/sh /tmp/TempUMount
+      umount ${FSMNT}
+      rm /tmp/TempUMount
     fi
 
-    # Unmount FS
-    /bin/sh /tmp/TempUMount
-    umount ${FSMNT}
-    rm /tmp/TempUMount
     
-    if [ ! -z "${ZROOT}" ]
-    then
-      zpool export -f ${ZROOT}
-    fi
-        
   fi # End of if ${i}a
      

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

@@ -32 +32 @@
   # Mount the bootdir now
   mount ${PART}a ${FSMNT}/bootdir
-  echo "${ZROOT}" > /tmp/upgradeZFS
+  echo "${ZROOT}" >/tmp/upgradeZFS
+  echo "${PART}a" >/uzip/ZFS-bootpart
+  echo "/dev/${ZROOT}" >/uzip/ZFS-root
 fi
 

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

@@ -170 +170 @@
   ZFSBOOTPART="`cat /uzip/ZFS-bootpart`"
 
-  # Setup our loader.conf entries for ZFS
-  echo 'zfs_load="YES"' >> ${FSMNT}/boot/loader.conf
-  echo "vfs.root.mountfrom=\"zfs:${BASENAME}/root\"" >> ${FSMNT}/boot/loader.conf
-  echo 'vm.kmem_size="512M"' >>${FSMNT}/boot/loader.conf
-  echo 'vm.kmem_size_max="512M"' >>${FSMNT}/boot/loader.conf
-
-  # Enable zfs in /etc/rc.conf
-  echo 'zfs_enable="YES"' >> ${FSMNT}/etc/rc.conf
-
-  # Copy over the /etc/hostid from our install CD to the HD
-  cp /etc/hostid ${FSMNT}/etc/hostid
-
-  # Move the kernel to /bootdir so we can bootup properly
-  mv -f ${FSMNT}/boot ${FSMNT}/bootdir/
-
-  # Create our link to /boot on the ZFS partition
-  ln -s /bootdir/boot ${FSMNT}/boot
-
+  if [ ! -e "/tmp/upgradeZFS" ]
+  then
+
+    # Setup our loader.conf entries for ZFS
+    echo 'zfs_load="YES"' >> ${FSMNT}/boot/loader.conf
+    echo "vfs.root.mountfrom=\"zfs:${BASENAME}/root\"" >> ${FSMNT}/boot/loader.conf
+    echo 'vm.kmem_size="512M"' >>${FSMNT}/boot/loader.conf
+    echo 'vm.kmem_size_max="512M"' >>${FSMNT}/boot/loader.conf
+
+    # Enable zfs in /etc/rc.conf
+    echo 'zfs_enable="YES"' >> ${FSMNT}/etc/rc.conf
+
+    # Copy over the /etc/hostid from our install CD to the HD
+    cp /etc/hostid ${FSMNT}/etc/hostid
+
+    # Move the kernel to /bootdir so we can bootup properly
+    mv -f ${FSMNT}/boot ${FSMNT}/bootdir/
+
+    # Create our link to /boot on the ZFS partition
+    ln -s /bootdir/boot ${FSMNT}/boot
+  fi
 
   # Reset our mount points for any extra ZFS partitions
@@ -240 +243 @@
   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