Changeset 2560

Timestamp:

08/07/08 16:35:15 (3 weeks 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

Location:

pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts

Files:

• PCBSD.FormatDisk.sh (modified) (2 diffs)
• PCBSD.FormatPartition.sh (modified) (1 diff)

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

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

@@ -10 +10 @@
 device=${1}
 
-# Get the Slice Number
+# Get the full Slice Number (Example /dev/ad0s1)
 slice=${2}
 
+# Get the device name without the /dev on it
+rawslice="`echo ${2} | cut -d '/' -f 3`"
 
 # Check if we need to shutdown any journals on this partition
-ls ${2}*.journal* >/dev/null 2>/dev/null
+ls ${slice}*.journal* >/dev/null 2>/dev/null
 if [ "$?" = "0" ]
 then
    cd /dev
-   for i in `ls ${2}*.journal*`
+   for i in `ls ${rawslice}*.journal`
    do
-     gjournal stop ${i}
-     gjournal clear ${i}
+     # Get rid of the .journal extension now
+     rawjournal="`echo ${i} | cut -d '.' -f 1`"
+     gjournal stop -f ${rawjournal}
+     gjournal clear ${rawjournal}
    done
 fi