summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorErmal <eri@pfsense.org>2013-04-29 08:46:10 +0000
committerErmal <eri@pfsense.org>2013-04-29 08:46:10 +0000
commitac62a50d9b8d50a4ef7fbde7fdc75758a5608d95 (patch)
tree4cda80b5c7a82121ea8705588bf5a3c7205e8878 /etc
parent004c14123ce789fadf281fc8b8e5222687706371 (diff)
downloadpfsense-ac62a50d9b8d50a4ef7fbde7fdc75758a5608d95.zip
pfsense-ac62a50d9b8d50a4ef7fbde7fdc75758a5608d95.tar.gz
Do not force the check to avoid garbling filesystems. Also be specific to check / filesystem and /cf on nano platform since the others will be checked on php code
Diffstat (limited to 'etc')
-rwxr-xr-xetc/rc12
1 files changed, 6 insertions, 6 deletions
diff --git a/etc/rc b/etc/rc
index 70996d8..dd58e59 100755
--- a/etc/rc
+++ b/etc/rc
@@ -33,9 +33,9 @@ fi
if [ -e /root/force_fsck ]; then
echo "Forcing filesystem check..."
- /sbin/fsck -fy -t ufs /
+ /sbin/fsck -y -t ufs /
if [ "$PLATFORM" = "nanobsd" ]; then
- /sbin/fsck -fy -t ufs /cf
+ /sbin/fsck -y -t ufs /cf
fi
fi
@@ -81,9 +81,9 @@ else
# Mount /. If it fails run a fsck.
if [ "$PLATFORM" = "nanobsd" ]; then
export PKG_TMPDIR=/root/
- /sbin/mount -uw / || (/sbin/fsck -fy; /sbin/mount -uw /)
+ /sbin/mount -uw / || (/sbin/fsck -y /; /sbin/fsck -y /cf; /sbin/mount -uw /)
else
- /sbin/mount -a || (/sbin/fsck -fy; /sbin/mount -a)
+ /sbin/mount -a || (/sbin/fsck -y /; /sbin/mount -a)
fi
# If /conf is a directory, convert it to a symlink to /cf/conf
@@ -98,11 +98,11 @@ else
if [ ! "$PLATFORM" = "jail" ]; then
# Check to see if a compact flash mountpoint exists
- # If it fails to mount then run a fsck -fy
+ # If it fails to mount then run a fsck -y
if grep -q cf /etc/fstab; then
/sbin/mount -w /cf 2>/dev/null
/sbin/mount -uw /cf || \
- (/sbin/umount /cf; /sbin/fsck -fy /cf; /sbin/mount -w /cf)
+ (/sbin/umount /cf; /sbin/fsck -y /cf; /sbin/mount -w /cf)
fi
fi
OpenPOWER on IntegriCloud