From 3863c11be5d48ad4d1a10156f474339bea04f5ae Mon Sep 17 00:00:00 2001 From: William Hubbs Date: Mon, 10 Sep 2012 15:43:42 -0500 Subject: netmount: add checks for rpc.idmapd for nfs4 filesystems Reported-by: X-Gentoo-Bug: 427996 X-Gentoo-Bug-URL: http://bugs.gentoo.org/show_bug.cgi?id=427996 --- init.d/netmount.in | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/init.d/netmount.in b/init.d/netmount.in index 963ad26d..22597838 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 -- cgit v1.2.3