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

[svn at pcbsd.org]

Author: kris
Date: 2008-05-24 13:27:33 -0700 (Sat, 24 May 2008)
New Revision: 1973

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

Fixed a few misplaced "'s and make sure that journaling is disabled on a device before running newfs on it



Modified: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.NewFS.sh
===================================================================
--- pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.NewFS.sh	2008-05-24 18:20:34 UTC (rev 1972)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.NewFS.sh	2008-05-24 20:27:33 UTC (rev 1973)
@@ -41,10 +41,16 @@
 
 
 # UFS with Soft Updates
-if [ "${FS} = "UFS-S" ]
+if [ "${FS}" = "UFS-S" ]
 then
   for DevName in `ls -1 ${1}[a,d-h]`
   do
+    # Make sure journaling isn't enabled on this device
+    if [ -e "${DevName}.journal" ]
+    then
+      gjournal stop ${DevName}.journal
+    fi
+
     echo "Running Newfs on ${DevName}"
     newfs -U ${DevName} >/dev/null 2>/dev/null
   done
@@ -52,10 +58,15 @@
 fi
 
 # UFS2 Vanilla
-if [ "${FS} = "UFS2" ]
+if [ "${FS}" = "UFS2" ]
 then
   for DevName in `ls -1 ${1}[a,d-h]`
   do
+    # Make sure journaling isn't enabled on this device
+    if [ -e "${DevName}.journal" ]
+    then
+      gjournal stop ${DevName}.journal
+    fi
     echo "Running Newfs on ${DevName}"
     newfs ${DevName} >/dev/null 2>/dev/null
   done