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

[svn at pcbsd.org]

Author: kris
Date: 2008-08-07 14:58:35 -0700 (Thu, 07 Aug 2008)
New Revision: 2559

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

Make sure to disable any swap space before trying to blow away a partition, this
was causing all kinds of problems with bsdlabel not putting the right label down properly



Modified: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.FormatPartition.sh
===================================================================
--- pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.FormatPartition.sh	2008-08-07 21:56:21 UTC (rev 2558)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.FormatPartition.sh	2008-08-07 21:58:35 UTC (rev 2559)
@@ -12,6 +12,7 @@
 # Get the Slice Number
 slice=${2}
 
+
 # Check if we need to shutdown any journals on this partition
 ls ${2}*.journal* >/dev/null 2>/dev/null
 if [ "$?" = "0" ]
@@ -24,6 +25,11 @@
    done
 fi
 
+# Make sure we have disabled swap on this drive
+swapoff ${slice}b
+
+sleep 4
+
 # Install new partition setup
 fdisk -f /tmp/fdiskconfig /dev/${device}