[gentoo-commits] proj/openrc:master commit in: init.d/, conf.d/

["William Hubbs" <williamh@gentoo.org>]

commit:     9473ac514cb72663d5c3bac8b5473cced4a20bf7
Author:     joe9 <joe9mail <AT> gmail <DOT> com>
AuthorDate: Sat Oct 24 22:55:59 2015 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Wed Jan 13 16:52:22 2016 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=9473ac51

allow the user to decide whether fsck aborts for errors

X-Gentoo-Bug: 564008
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=564008

 conf.d/fsck    | 6 ++++++
 init.d/fsck.in | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/conf.d/fsck b/conf.d/fsck
index 16aa575..30131ea 100644
--- a/conf.d/fsck
+++ b/conf.d/fsck
@@ -32,3 +32,9 @@ fsck_on_battery="YES"
 # This is useful when periodic filesystem checks are causing undesirable
 # delays at startup, but such delays at shutdown are acceptable.
 fsck_shutdown="NO"
+
+# fsck_abort_on_errors can be set to no to cause fsck to not abort on
+# errors.
+# This is useful when periodic filesystem checks are causing undesirable
+# aborts.
+fsck_abort_on_errors="YES"

diff --git a/init.d/fsck.in b/init.d/fsck.in
index 5e5b3e9..005e87f 100644
--- a/init.d/fsck.in
+++ b/init.d/fsck.in
@@ -20,7 +20,7 @@ depend()
 }
 
 _abort() {
-	rc-abort
+	yesno ${fsck_abort_on_errors:-yes} && rc-abort
 	return 1
 }