diff options
| author | avg <avg@FreeBSD.org> | 2009-06-10 19:03:23 +0000 |
|---|---|---|
| committer | avg <avg@FreeBSD.org> | 2009-06-10 19:03:23 +0000 |
| commit | 72ecca2c268bc360ea02c2241bf2426bf22d443b (patch) | |
| tree | 01eeef823a4efe6ac63ca0321fb08f32257f7b3b | |
| parent | 20201c3a83c2f5f4bb3aa40ed833dcf29b9f6fe5 (diff) | |
| download | FreeBSD-src-72ecca2c268bc360ea02c2241bf2426bf22d443b.zip FreeBSD-src-72ecca2c268bc360ea02c2241bf2426bf22d443b.tar.gz | |
rc.d/fsck: allow additional options for fsck_y_enable via fsck_y_flags
Primary intention is to allow to pass -C option to avoid (re-)checking
clean filesystems when preening fails and fsck -y kicks in.
Submitted by: marck
Reviewed by: current@
Approved by: jhb (mentor)
MFC after: 1 week
| -rw-r--r-- | etc/defaults/rc.conf | 1 | ||||
| -rwxr-xr-x | etc/rc.d/fsck | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/etc/defaults/rc.conf b/etc/defaults/rc.conf index f381423..edeedae 100644 --- a/etc/defaults/rc.conf +++ b/etc/defaults/rc.conf @@ -83,6 +83,7 @@ geli_swap_flags="-e aes -l 256 -s 4096 -d" # Options for GELI-encrypted root_rw_mount="YES" # Set to NO to inhibit remounting root read-write. fsck_y_enable="NO" # Set to YES to do fsck -y if the initial preen fails. +fsck_y_flags="" # Additional flags for fsck -y background_fsck="YES" # Attempt to run fsck in the background where possible. background_fsck_delay="60" # Time to wait (seconds) before starting the fsck. netfs_types="nfs:NFS nfs4:NFS4 smbfs:SMB portalfs:PORTAL nwfs:NWFS" # Net filesystems. diff --git a/etc/rc.d/fsck b/etc/rc.d/fsck index bf51089..a2ca0b7 100755 --- a/etc/rc.d/fsck +++ b/etc/rc.d/fsck @@ -44,8 +44,8 @@ fsck_start() ;; 8) if checkyesno fsck_y_enable; then - echo "File system preen failed, trying fsck -y." - fsck -y + echo "File system preen failed, trying fsck -y ${fsck_y_flags}" + fsck -y ${fsck_y_flags} case $? in 0) ;; |
