From 87b8d937c6df67309c3535921a9913d2e0d5a929 Mon Sep 17 00:00:00 2001 From: luporl Date: Wed, 18 Mar 2020 13:09:47 +0000 Subject: [PATCH] Add fsck_flags config option On UFS with SU+J, sometimes fsck's default recovery from journal marks the filesystem as clean but some errors remain. With SU only, default fsck in preen mode sometimes thinks all errors have been fixed but some still remain. To address the issues above, this change adds a new config option: fsck_flags. By default it's set to -p, but the user may change it to -y or -f -y, for instance, to force a full fsck after a system crash. Submitted by: jhibbits@ (original version) Reviewed by: mckusick Differential Revision: https://reviews.freebsd.org/D24087 --- libexec/rc/rc.conf | 1 + libexec/rc/rc.d/fsck | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libexec/rc/rc.conf b/libexec/rc/rc.conf index 1b7b235f47c..079f1601205 100644 --- a/libexec/rc/rc.conf +++ b/libexec/rc/rc.conf @@ -101,6 +101,7 @@ geli_autodetach="YES" # Automatically detach on last close. root_rw_mount="YES" # Set to NO to inhibit remounting root read-write. root_hold_delay="30" # Time to wait for root mount hold release. +fsck_flags="-p" # May be changed to -f (or -f -y) to force a full fsck fsck_y_enable="NO" # Set to YES to do fsck -y if the initial preen fails. fsck_y_flags="-T ffs:-R -T ufs:-R" # Additional flags for fsck -y background_fsck="YES" # Attempt to run fsck in the background where possible. diff --git a/libexec/rc/rc.d/fsck b/libexec/rc/rc.d/fsck index 747d357c441..a7fe9a15d5c 100755 --- a/libexec/rc/rc.d/fsck +++ b/libexec/rc/rc.d/fsck @@ -25,10 +25,11 @@ fsck_start() trap : 3 check_startmsgs && echo "Starting file system checks:" + # Background fsck can only be run with -p if checkyesno background_fsck; then fsck -F -p else - fsck -p + fsck ${fsck_flags} fi err=$? @@ -37,10 +38,11 @@ fsck_start() "available; retrying" root_hold_wait check_startmsgs && echo "Restarting file system checks:" + # Background fsck can only be run with -p if checkyesno background_fsck; then fsck -F -p else - fsck -p + fsck ${fsck_flags} fi err=$? fi -- 2.45.0