From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 8847F1388BF for ; Wed, 13 Jan 2016 17:02:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 59E6D21C04D; Wed, 13 Jan 2016 17:02:06 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A743321C04B for ; Wed, 13 Jan 2016 17:02:05 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8B9A0340928 for ; Wed, 13 Jan 2016 17:02:04 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AD0F8A01 for ; Wed, 13 Jan 2016 17:02:01 +0000 (UTC) From: "William Hubbs" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "William Hubbs" Message-ID: <1452703942.9473ac514cb72663d5c3bac8b5473cced4a20bf7.williamh@OpenRC> Subject: [gentoo-commits] proj/openrc:master commit in: init.d/, conf.d/ X-VCS-Repository: proj/openrc X-VCS-Files: conf.d/fsck init.d/fsck.in X-VCS-Directories: init.d/ conf.d/ X-VCS-Committer: williamh X-VCS-Committer-Name: William Hubbs X-VCS-Revision: 9473ac514cb72663d5c3bac8b5473cced4a20bf7 X-VCS-Branch: master Date: Wed, 13 Jan 2016 17:02:01 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 171124de-bba5-4fde-974b-36e71dfab9d4 X-Archives-Hash: c621fdb586de24b761d74a97bcd8cfd6 commit: 9473ac514cb72663d5c3bac8b5473cced4a20bf7 Author: joe9 gmail com> AuthorDate: Sat Oct 24 22:55:59 2015 +0000 Commit: William Hubbs gentoo 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 }