summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorScott Ullrich <sullrich@pfsense.org>2005-11-18 22:24:13 +0000
committerScott Ullrich <sullrich@pfsense.org>2005-11-18 22:24:13 +0000
commitfac17748b871c7db9cc206aa00a9b3f89b1f0069 (patch)
tree9331b8cb2d50ef386acc144608111ed0a368f62f /etc
parentb03c0a0177cfad22b8efeaa71c55dfb144f869e8 (diff)
downloadpfsense-fac17748b871c7db9cc206aa00a9b3f89b1f0069.zip
pfsense-fac17748b871c7db9cc206aa00a9b3f89b1f0069.tar.gz
MFC latest rc
Diffstat (limited to 'etc')
-rwxr-xr-xetc/rc18
1 files changed, 9 insertions, 9 deletions
diff --git a/etc/rc b/etc/rc
index a925fd6..b88b148 100755
--- a/etc/rc
+++ b/etc/rc
@@ -46,20 +46,20 @@ fi
# Mount /. If it fails run a fsck.
if [ ! "$PLATFORM" = "cdrom" ] ; then
- /sbin/mount -uw / || (/sbin/fsck -y && /sbin/mount -uw /)
+ /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
fi
# Check to see if a compact flash mountpoint exists
# If it fails to mount then run a fsck -y
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
+ /sbin/mount -uw /cf || (/sbin/fsck -y /cf; /sbin/mount -uw /cf)
fi
if [ "$PLATFORM" = "cdrom" ] ; then
OpenPOWER on IntegriCloud