From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-851138-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
by finch.gentoo.org (Postfix) with ESMTP id F29951384B4
for <garchives@archives.gentoo.org>; Fri, 11 Dec 2015 19:56:54 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 41E11E08A5;
Fri, 11 Dec 2015 19:56:54 +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 D0570E08A5
for <gentoo-commits@lists.gentoo.org>; Fri, 11 Dec 2015 19:56:53 +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 98DD034076D
for <gentoo-commits@lists.gentoo.org>; Fri, 11 Dec 2015 19:56:52 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 0EE6EA86
for <gentoo-commits@lists.gentoo.org>; Fri, 11 Dec 2015 19:56:49 +0000 (UTC)
From: "William Hubbs" <williamh@gentoo.org>
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" <williamh@gentoo.org>
Message-ID: <1449863763.c45313dfa9880c4aedb72da1b2ac3159eee05a93.williamh@OpenRC>
Subject: [gentoo-commits] proj/openrc:master commit in: init.d/
X-VCS-Repository: proj/openrc
X-VCS-Files: init.d/netmount.in
X-VCS-Directories: init.d/
X-VCS-Committer: williamh
X-VCS-Committer-Name: William Hubbs
X-VCS-Revision: c45313dfa9880c4aedb72da1b2ac3159eee05a93
X-VCS-Branch: master
Date: Fri, 11 Dec 2015 19:56:49 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: ceb10393-37da-4649-a5a6-bbf902eb13d7
X-Archives-Hash: 7fb800ddaa5e56a6d6125802cb62c351
commit: c45313dfa9880c4aedb72da1b2ac3159eee05a93
Author: Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 8 22:02:31 2015 +0000
Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Fri Dec 11 19:56:03 2015 +0000
URL: https://gitweb.gentoo.org/proj/openrc.git/commit/?id=c45313df
netmount: use want dependency to start nfsclient
add in parsing of fstab to determine if nfsclient should be automatically
started so that netmount can mount nfs without adding nfsclient
to the default runlevel
This fixes #71.
init.d/netmount.in | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/init.d/netmount.in b/init.d/netmount.in
index d1f3cff..ac909e0 100644
--- a/init.d/netmount.in
+++ b/init.d/netmount.in
@@ -6,8 +6,16 @@ description="Mounts network shares according to /etc/fstab."
depend()
{
- config /etc/fstab
- use afc-client amd nfsclient autofs openvpn
+ local opts mywant=""
+ for opts in $(fstabinfo -o -t nfs,nfs4); do
+ case $opts in
+ noauto) ;;
+ *) mywant="$mywant nfsclient"; break ;;
+ esac
+ done
+ config /etc/fstab
+ want $mywant
+ use afc-client amd openvpn
use dns
keyword -jail -prefix -systemd-nspawn -vserver -lxc
}