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

[svn at pcbsd.org]

Author: kris
Date: 2008-08-05 09:22:05 -0700 (Tue, 05 Aug 2008)
New Revision: 2527

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

Fixed some bugs when doing an upgrade, and it not finding any available partitions



Modified: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.FindUpdateParts.sh
===================================================================
--- pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.FindUpdateParts.sh	2008-08-05 15:47:16 UTC (rev 2526)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.FindUpdateParts.sh	2008-08-05 16:22:05 UTC (rev 2527)
@@ -7,9 +7,21 @@
 
 for i in `find -E /dev -regex '/dev/(ad|ar|aacd|mixd|mlyd|amrd|idad|twed|da)[0-9]+s[1-4]' -print`
 do
-  if [ -e "${i}a" ]
+  # Set our flag that we have not found any mounts
+  FOUNDMNT="0"
+
+  if [ -e "${i}a.journal" ]
   then
+    mount ${i}a.journal ${FSMNT}
+    FOUNDMNT="1"
+  elif [ -e "${i}a" ]
+  then
     mount ${i}a ${FSMNT}
+    FOUNDMNT="1"
+  fi
+
+  if [ "${FOUNDMNT}" = "1" ]
+  then
     if [ -e "${i}b" ]
     then
       swapon ${i}b