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

svn at pcbsd.org svn at pcbsd.org
Thu Aug 7 14:50:41 PDT 2008


Author: kris
Date: 2008-08-07 14:50:41 -0700 (Thu, 07 Aug 2008)
New Revision: 2556

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

Fixed another bug when installing over the top of gjournal partitions



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:12:44 UTC (rev 2555)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.FormatPartition.sh	2008-08-07 21:50:41 UTC (rev 2556)
@@ -12,14 +12,15 @@
 # Get the Slice Number
 slice=${2}
 
-# Check if we need to shutdown any journals on this drive
-ls /dev/${1}${2}*.journal* >/dev/null 2>/dev/null
+# Check if we need to shutdown any journals on this partition
+ls ${2}*.journal* >/dev/null 2>/dev/null
 if [ "$?" = "0" ]
 then
    cd /dev
-   for i in `ls ${1}${2}*.journal*`
+   for i in `ls ${2}*.journal*`
    do
      gjournal stop ${i}
+     gjournal clear ${i}
    done
 fi
 
@@ -29,7 +30,7 @@
 sleep 2
 
 # Clean up old partition
-dd if=/dev/zero of=/dev/${slice} count=1024
+dd if=/dev/zero of=${slice} count=1024
 
 sleep 1
 



More information about the Commits mailing list