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

[svn at pcbsd.org]

Author: kris
Date: 2010-03-09 15:36:49 -0800 (Tue, 09 Mar 2010)
New Revision: 6383

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

Fixed a few small bugs in backend, hide gpart not found messages, and fix error when using GPT and confirming that "/" is
the first partition



Modified: pcbsd/trunk/pc-sysinstall/backend/functions-bsdlabel.sh
===================================================================
--- pcbsd/trunk/pc-sysinstall/backend/functions-bsdlabel.sh	2010-03-07 10:04:29 UTC (rev 6382)
+++ pcbsd/trunk/pc-sysinstall/backend/functions-bsdlabel.sh	2010-03-09 23:36:49 UTC (rev 6383)
@@ -342,7 +342,7 @@
       # Check if we found a valid root partition
       check_for_mount "${MNT}" "/"
       if [ "${?}" = "0" ] ; then
-        if [ "${FOUNDDISKPARTS}" = "1" ] ; then
+        if [ "${CURPART}" = "2" ] ; then
           FOUNDROOT="0" ; export FOUNDROOT
         else
           FOUNDROOT="1" ; export FOUNDROOT

Modified: pcbsd/trunk/pc-sysinstall/backend/functions-disk.sh
===================================================================
--- pcbsd/trunk/pc-sysinstall/backend/functions-disk.sh	2010-03-07 10:04:29 UTC (rev 6382)
+++ pcbsd/trunk/pc-sysinstall/backend/functions-disk.sh	2010-03-09 23:36:49 UTC (rev 6383)
@@ -9,14 +9,14 @@
   DISK="$1"
 
   # Check for any swaps to stop
-  for i in `gpart show ${DISK} | grep 'freebsd-swap' | tr -s ' ' | cut -d ' ' -f 4`
+  for i in `gpart show ${DISK} 2>/dev/null | grep 'freebsd-swap' | tr -s ' ' | cut -d ' ' -f 4`
   do
     swapoff /dev/${DISK}s${i}b >/dev/null 2>/dev/null
     swapoff /dev/${DISK}p${i} >/dev/null 2>/dev/null
   done
 
   # Delete the gparts now
-  for i in `gpart show ${DISK} | tr -s ' ' | cut -d ' ' -f 4`
+  for i in `gpart show ${DISK} 2>/dev/null | tr -s ' ' | cut -d ' ' -f 4`
   do
    if [ "${i}" != "ad0" -a "${i}" != "-" ] ; then
      rc_nohalt "gpart delete -i ${i} ${DISK}"