[PC-BSD Commits] r6278 - pcbsd/trunk/pc-sysinstall/backend-query

[svn at pcbsd.org]

Author: kris
Date: 2010-02-19 07:36:38 -0800 (Fri, 19 Feb 2010)
New Revision: 6278

Modified:
   pcbsd/trunk/pc-sysinstall/backend-query/update-part-list.sh
Log:

Fixed some bugs with the update script, don't unmount partitions we are using, may help fix crashes during
the install, also make sure to unmount everything we mounted



Modified: pcbsd/trunk/pc-sysinstall/backend-query/update-part-list.sh
===================================================================
--- pcbsd/trunk/pc-sysinstall/backend-query/update-part-list.sh	2010-02-19 10:02:55 UTC (rev 6277)
+++ pcbsd/trunk/pc-sysinstall/backend-query/update-part-list.sh	2010-02-19 15:36:38 UTC (rev 6278)
@@ -62,12 +62,9 @@
     then
       PART="${i}"
 
-      touch ${TMPDIR}/TempUMount
-
       mount -t devfs devfs ${FSMNT}/dev
       chroot ${FSMNT} /sbin/mount -a >>${LOGOUT} 2>>${LOGOUT}
 
-  
       # Now lets see what type of system we've found here
       # Create Script
       echo '#!/bin/sh
@@ -106,29 +103,19 @@
       if [ ! -z "${ZROOT}" ]
       then
         umount ${FSMNT}/bootdir >/dev/null 2>/dev/null
-        /bin/sh /tmp/TempUMount >/dev/null 2>/dev/null
 
         # Unmount any extra fs from the zfs pool
         zfs unmount -a >/dev/null 2>/dev/null
-
-        umount ${FSMNT} >/dev/null 2>/dev/null
-        rm /tmp/TempUMount >/dev/null 2>/dev/null
-
-        # Remount the bootdir to /mnt
-        mount ${PART}a ${FSMNT} >/dev/null 2>/dev/null
-
-        # Copy over our ZFS cache data
-        cp /boot/zfs/* ${FSMNT}/boot/zfs/ >/dev/null 2>/dev/null 
-
-        # Unmount the /bootdir partition again
-        umount ${FSMNT} >/dev/null 2>/dev/null
-      else
-        # Unmount FS
-        chroot ${FSMNT} /sbin/umount -a >/dev/null 2>/dev/null
-        umount ${FSMNT}/usr >/dev/null 2>/dev/null
-        umount ${FSMNT}/dev >/dev/null 2>/dev/null
-        umount ${FSMNT} >/dev/null 2>/dev/null
       fi
+
+      # Unmount FS
+      chroot ${FSMNT} /sbin/umount -a >/dev/null 2>/dev/null
+      umount -f ${FSMNT}/usr >/dev/null 2>/dev/null
+      umount -f ${FSMNT}/var >/dev/null 2>/dev/null
+      umount -f ${FSMNT}/proc >/dev/null 2>/dev/null
+      umount -f ${FSMNT}/compat/linux/proc >/dev/null 2>/dev/null
+      umount -f ${FSMNT}/dev >/dev/null 2>/dev/null
+      umount -f ${FSMNT} >/dev/null 2>/dev/null
     
     fi # End of if ${i}a