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

[svn at pcbsd.org]

Author: kris
Date: 2009-12-10 12:53:36 -0800 (Thu, 10 Dec 2009)
New Revision: 5542

Modified:
   pcbsd/trunk/pc-sysinstall/backend/functions-upgrade.sh
Log:

Some unmount fixes for upgrades



Modified: pcbsd/trunk/pc-sysinstall/backend/functions-upgrade.sh
===================================================================
--- pcbsd/trunk/pc-sysinstall/backend/functions-upgrade.sh	2009-12-10 20:37:37 UTC (rev 5541)
+++ pcbsd/trunk/pc-sysinstall/backend/functions-upgrade.sh	2009-12-10 20:53:36 UTC (rev 5542)
@@ -28,16 +28,16 @@
       if [ "$?" = "0" ]
       then
         rc_halt "mount /dev/${MPART}${j}.journal ${FSMNT}${MNT}"
-        echo "umount /dev/${MPART}${j}.journal" >>${TMPDIR}/.upgrade-unmount
+        echo "umount -f /dev/${MPART}${j}.journal" >>${TMPDIR}/.upgrade-unmount
       else
         rc_halt "mount /dev/${MPART}${j} ${FSMNT}${MNT}"
-        echo "umount /dev/${MPART}${j}" >>${TMPDIR}/.upgrade-unmount
+        echo "umount -f /dev/${MPART}${j}" >>${TMPDIR}/.upgrade-unmount
       fi
     fi
   done
  
   # Save which partition was mounted, so we may unmount it later
-  echo "umount /dev/${MPART}a" >>${TMPDIR}/.upgrade-unmount
+  echo "umount -f /dev/${MPART}a" >>${TMPDIR}/.upgrade-unmount
 
   # Now before we start the upgrade, make sure we set our noschg flags
   echo_log "Cleaning up old filesystem... Please wait..."
@@ -127,5 +127,5 @@
 unmount_upgrade()
 {
    # Run our saved unmount script for these file-systems
-   rc_halt "sh ${TMPDIR}/.upgrade-unmount"
+   rc_nohalt "sh ${TMPDIR}/.upgrade-unmount"
 };