Changeset 2560 for pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.FormatDisk.sh

Timestamp:

08/07/08 16:35:15 (4 months ago)

Author:

kris

Message:

Fixed what should be all problems when using gjournal, either going from journaling to UFS+S or going to UFS regular. Now it the scripts correctly stop gjournal, which allows bsdlabel to work properly

Files:

• pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.FormatDisk.sh (modified) (2 diffs)

pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.FormatDisk.sh

@@ -7 +7 @@
 sysctl kern.geom.debugflags=16
 
+#Get our Device Name
+device=${1}
+
 # Check if we need to shutdown any journals on this drive
 ls /dev/${1}*.journal >/dev/null 2>/dev/null
@@ -14 +17 @@
    for i in `ls ${1}*.journal`
    do
-     gjournal stop ${i}
-     gjournal clear ${i}
+     rawjournal="`echo ${i} | cut -d '.' -f 1`"
+     gjournal stop -f ${rawjournal}
+     gjournal clear ${rawjournal}
    done
 fi
 
-#Get our Device Name
-device=${1}
 
 #Erase any existing bootloader