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 652D7138010 for ; Mon, 10 Sep 2012 20:57:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D174521C02E; Mon, 10 Sep 2012 20:57:09 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id A127821C02E for ; Mon, 10 Sep 2012 20:57:09 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E2A1233C559 for ; Mon, 10 Sep 2012 20:57:08 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id A201CE543C for ; Mon, 10 Sep 2012 20:57:07 +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: <1347310612.ed0696443d213ac5227b0a18b57ae32174d897f0.WilliamH@OpenRC> Subject: [gentoo-commits] proj/openrc:openrc-0.10.x 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: ed0696443d213ac5227b0a18b57ae32174d897f0 X-VCS-Branch: openrc-0.10.x Date: Mon, 10 Sep 2012 20:57:07 +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: 6cd8eb7f-3d04-431a-a5ce-1f75a2b60f7e X-Archives-Hash: 626a744fb7381ff1a0efa803e29b12e2 commit: ed0696443d213ac5227b0a18b57ae32174d897f0 Author: William Hubbs gmail com> AuthorDate: Mon Sep 10 20:43:42 2012 +0000 Commit: William Hubbs gentoo org> CommitDate: Mon Sep 10 20:56:52 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=ed069644 netmount: add checks for rpc.idmapd for nfs4 filesystems Reported-by: gmx.net> X-Gentoo-Bug: 427996 X-Gentoo-Bug-URL: http://bugs.gentoo.org/show_bug.cgi?id=427996 --- init.d/netmount.in | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/init.d/netmount.in b/init.d/netmount.in index cf5971c..c03820e 100644 --- a/init.d/netmount.in +++ b/init.d/netmount.in @@ -19,6 +19,21 @@ need_portmap() return 1 } +need_idmap() +{ + local opts= + local IFS=" +" + set -- $(fstabinfo --options --fstype nfs4) + for opts; do + case ,$opts, in + *,noauto,*|*,nolock,*);; + *) return 0;; + esac + done + return 1 +} + depend() { # Only have portmap as a dependency if there is a nfs mount in fstab @@ -31,6 +46,12 @@ depend() || pmap="$pmap portmap" fi + # Only have rpc.idmapd as a dependency if there is a nfs4 mount in fstab + # that is set to mount at boot + if need_idmap; then + pmap="$pmap rpc.idmapd" + fi + config /etc/fstab need net $pmap use afc-client amd autofs openvpn