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

[svn at pcbsd.org]

Author: kris
Date: 2008-05-22 14:03:53 -0700 (Thu, 22 May 2008)
New Revision: 1952

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

Added variables for MNTOPTS to be used when using UFS+Journaling or any
other options we may need for filesystems



Modified: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.MountDisk.sh
===================================================================
--- pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.MountDisk.sh	2008-05-22 18:01:46 UTC (rev 1951)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.MountDisk.sh	2008-05-22 21:03:53 UTC (rev 1952)
@@ -21,14 +21,16 @@
 if [ "$FS" = "UFS-J" ]
 then
   EXTENSION=".journal"
+  MNTOPTS=",async"
 else
   EXTENSION=""
+  MNTOPTS=""
 fi
 
 
 echo "Creating fstab file";
 
-mount ${ROOTPART}a${EXTENSION} /mnt >/dev/null 2>/dev/null
+mount ${ROOTPART}a${EXTENSION} -o rw${MNTOPTS} /mnt >/dev/null 2>/dev/null
 
 if [ -e "/tmp/mirrorDrive" ]
 then
@@ -66,7 +68,7 @@
 # Create the FSTAB file
 echo "# Device                Mountpoint      FStype  Options         Dump    Pass#
 ${ROOTPART}b${ENC}          	none            swap    sw              0       0
-${ROOTPART}a${EXTENSION}          	/               ufs     rw              1       1 " > /tmp/fstab
+${ROOTPART}a${EXTENSION}          	/               ufs     rw${MNTOPTS}              1       1 " > /tmp/fstab
 
 ##
 # Check for any extra mount points and do it now
@@ -74,33 +76,33 @@
 if [ "${3}" ]
 then
    mkdir -p /mnt${2}
-   echo "${ROOTPART}e${EXTENSION}          	${3}               ufs     rw              1       1 
+   echo "${ROOTPART}e${EXTENSION}          	${3}               ufs     rw${MNTOPTS}              1       1 
 " >> /tmp/fstab
-   mount ${ROOTPART}e${EXTENSION} /mnt${3}
+   mount ${ROOTPART}e${EXTENSION} -o rw${MNTOPTS} /mnt${3}
 fi
 
 if [ "${4}" ]
 then
    mkdir -p /mnt${4}
-   echo "${ROOTPART}f${EXTENSION}          	${4}               ufs     rw              1       1 
+   echo "${ROOTPART}f${EXTENSION}          	${4}               ufs     rw${MNTOPTS}              1       1 
 " >> /tmp/fstab
-   mount ${ROOTPART}f${EXTENSION} /mnt${4}
+   mount ${ROOTPART}f${EXTENSION} -o rw${MNTOPTS} /mnt${4}
 fi
 
 if [ "${5}" ]
 then
    mkdir -p /mnt${5}
-   echo "${ROOTPART}g${EXTENSION}          	${5}               ufs     rw              1       1 
+   echo "${ROOTPART}g${EXTENSION}          	${5}               ufs     rw${MNTOPTS}              1       1 
 " >> /tmp/fstab
-   mount ${ROOTPART}g${EXTENSION} /mnt${5}
+   mount ${ROOTPART}g${EXTENSION} -o rw${MNTOPTS} /mnt${5}
 fi
 
 if [ "${6}" ]
 then
    mkdir -p /mnt${6}
-   echo "${ROOTPART}h${EXTENSION}          	${6}               ufs     rw              1       1 
+   echo "${ROOTPART}h${EXTENSION}          	${6}               ufs     rw${MNTOPTS}              1       1 
 " >> /tmp/fstab
-   mount ${ROOTPART}h${EXTENSION} /mnt${6}
+   mount ${ROOTPART}h${EXTENSION} -o rw${MNTOPTS} /mnt${6}
 fi
 
 cd /