summaryrefslogtreecommitdiffstats
path: root/etc/rc
diff options
context:
space:
mode:
authorScott Ullrich <sullrich@pfsense.org>2005-11-18 19:03:31 +0000
committerScott Ullrich <sullrich@pfsense.org>2005-11-18 19:03:31 +0000
commit16125d1ce14a05260f33c1b8be7715d873ed62a2 (patch)
tree8cc4a9ac7ceb57d43e80f9a0439bc364076241f3 /etc/rc
parent86329796bf2d8efb652141e00f1ef48cde4a61b9 (diff)
downloadpfsense-16125d1ce14a05260f33c1b8be7715d873ed62a2.zip
pfsense-16125d1ce14a05260f33c1b8be7715d873ed62a2.tar.gz
MFC latest rc changes
Diffstat (limited to 'etc/rc')
-rwxr-xr-xetc/rc16
1 files changed, 8 insertions, 8 deletions
diff --git a/etc/rc b/etc/rc
index 9d16695..a925fd6 100755
--- a/etc/rc
+++ b/etc/rc
@@ -46,14 +46,7 @@ fi
# Mount /. If it fails run a fsck.
if [ ! "$PLATFORM" = "cdrom" ] ; then
- /sbin/mount -uw / || (/sbin/fsck -y && /sbin/mount -uw /)
-
- # If /conf is a directory, convert it to a symlink
- # to /cf/conf
- if [ -d "/conf" ]; then
- rm -rf /conf
- ln -s /cf/conf /conf
- fi
+ /sbin/mount -uw / || (/sbin/fsck -y && /sbin/mount -uw /)
fi
# Check to see if a compact flash mountpoint exists
@@ -62,6 +55,13 @@ if grep -q cf /etc/fstab; then
/sbin/mount -uw /cf || (/sbin/fsck -y && /sbin/mount -uw /cf)
fi
+# If /conf is a directory, convert it to a symlink
+# to /cf/conf
+if [ -d "/conf" ]; then
+ rm -rf /conf
+ ln -s /cf/conf /conf
+fi
+
if [ "$PLATFORM" = "cdrom" ] ; then
# do nothing for cdrom platform
elif [ "$PLATFORM" = "embedded" ] ; then
OpenPOWER on IntegriCloud