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 B311158973 for ; Tue, 19 Jan 2016 19:37:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 41B2221C007; Tue, 19 Jan 2016 19:37:56 +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 E7CA621C007 for ; Tue, 19 Jan 2016 19:37:55 +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 B5A8F34068A for ; Tue, 19 Jan 2016 19:37:54 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7CA24A2C for ; Tue, 19 Jan 2016 19:37:41 +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: <1453232044.cd7883d25d0a9321b68df1c1e6ad9662306fa9e7.williamh@OpenRC> Subject: [gentoo-commits] proj/openrc:master commit in: init.d/, conf.d/ X-VCS-Repository: proj/openrc X-VCS-Files: conf.d/localmount init.d/localmount.in X-VCS-Directories: conf.d/ init.d/ X-VCS-Committer: williamh X-VCS-Committer-Name: William Hubbs X-VCS-Revision: cd7883d25d0a9321b68df1c1e6ad9662306fa9e7 X-VCS-Branch: master Date: Tue, 19 Jan 2016 19:37:41 +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: 744789e2-e44c-4c40-9737-a4b1fe4dec35 X-Archives-Hash: 6ab4efd256f22f1402feda4c4ba2e0e5 commit: cd7883d25d0a9321b68df1c1e6ad9662306fa9e7 Author: William Hubbs gmail com> AuthorDate: Tue Jan 19 18:32:56 2016 +0000 Commit: William Hubbs gentoo org> CommitDate: Tue Jan 19 19:34:04 2016 +0000 URL: https://gitweb.gentoo.org/proj/openrc.git/commit/?id=cd7883d2 localmount: Allow users to control whether errors are ignored X-Gentoo-Bug: 572138 X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=572138 conf.d/localmount | 6 ++++++ init.d/localmount.in | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/conf.d/localmount b/conf.d/localmount index e3361da..397e8cd 100644 --- a/conf.d/localmount +++ b/conf.d/localmount @@ -1,3 +1,9 @@ # Stop the unmounting of certain points. # This could be useful for some NFS related work. #no_umounts="/dir1:/var/dir2" +# +# Ignore errors when mounting local file systems. +# This should be left alone unless you know what you are doing. If it is +# set to yes, not only will we allow mount failures, but we will ignore +# syntax errors in fstab. +#ignore_mount_errors="NO" diff --git a/init.d/localmount.in b/init.d/localmount.in index a2b7a8a..cfc841a 100644 --- a/init.d/localmount.in +++ b/init.d/localmount.in @@ -39,6 +39,11 @@ start() rc=$? if [ "$RC_UNAME" != Linux ]; then rc=0 + elif yesno "${ignore_mount_errors:-NO}"; then + if [ $rc -ne 0 ]; then + ewarn "localmount: errors detected, but ignored" + fi + rc=0 fi return $rc }