diff --git a/conf.d/fsck b/conf.d/fsck index 16aa5752..5d42c9d0 100644 --- a/conf.d/fsck +++ b/conf.d/fsck @@ -13,13 +13,6 @@ #fsck_passno=">1" #fsck_passno="<2" -# If passno is not enough granularity, you can also specify mountpoints to -# check. This should NOT be used for the default non-multiplexed fsck, or your -# system might not be checked. Additionally, it is mutually exclusive with -# the fsck_passno setting. -#fsck_mnt="" -#fsck_mnt="/home" - # Most modern fs's don't require a full fsck on boot, but for those that do # it may be advisable to skip this when running on battery. # WARNING: Do not turn this off if you have any JFS partitions. diff --git a/init.d/fsck.in b/init.d/fsck.in index 03b2939e..54537f61 100644 --- a/init.d/fsck.in +++ b/init.d/fsck.in @@ -48,13 +48,8 @@ start() if [ -n "$fsck_passno" ]; then check_extra="[passno $fsck_passno] $check_extra" - if -n "$fsck_mnt" ]; then - eerror "Only 1 of fsck_passno and fsck_mnt must be set!" - return 1 - fi fi ebegin "Checking local filesystems $check_extra" - # Append passno mounts for p in $fsck_passno; do local IFS="$_IFS" case "$p" in @@ -63,16 +58,10 @@ start() set -- "$@" $(fstabinfo --passno "$p") unset IFS done - # Append custom mounts - for m in $fsck_mnt ; do - local IFS="$_IFS" - set -- "$@" "$m" - unset IFS - done if [ "$RC_UNAME" = Linux ]; then fsck_opts="$fsck_opts -C0 -T" - if [ -z "$fsck_passno" -a -z "$fsck_mnt" ]; then + if [ -z "$fsck_passno" ]; then fsck_args=${fsck_args--A -p} if echo 2>/dev/null >/.test.$$; then rm -f /.test.$$