diff options
| author | William Hubbs <williamh@gentoo.org> | 2011-11-06 22:06:58 -0600 |
|---|---|---|
| committer | William Hubbs <williamh@gentoo.org> | 2011-11-06 22:06:58 -0600 |
| commit | 5a3599df8a15b1212857335101c9d31fb19e87e2 (patch) | |
| tree | 339f0a8aff3dff0e2e1aedb9618d15d5956f7aa0 | |
| parent | e3b39a677b535bc2676a939519906f6b2dbce6f4 (diff) | |
| download | openrc-5a3599df8a15b1212857335101c9d31fb19e87e2.tar.gz openrc-5a3599df8a15b1212857335101c9d31fb19e87e2.tar.bz2 openrc-5a3599df8a15b1212857335101c9d31fb19e87e2.tar.xz | |
Revert "fsck: add the ability to specify mount points to check"
This reverts commit e3b39a677b535bc2676a939519906f6b2dbce6f4.
I misunderstood and thought this was ready to go in the tree, but it was
on a remote branch only for a review.
| -rw-r--r-- | conf.d/fsck | 7 | ||||
| -rw-r--r-- | init.d/fsck.in | 13 |
2 files changed, 1 insertions, 19 deletions
diff --git a/conf.d/fsck b/conf.d/fsck index 16aa575..5d42c9d 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 03b2939..54537f6 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.$$ |