[patch] 0001-netmount-do-not-handle-NFS-mounts.patch

0001-netmount-do-not-handle-NFS-mounts.patch (text/plain), 3.29 KB, created by William Hubbs on 2012-09-14 19:37:03 UTC

From 1fb59be589de1ce1b0fe3e6a32d1217a4fd6f74a Mon Sep 17 00:00:00 2001
From: William Hubbs <[e-mail]>
Date: Fri, 14 Sep 2012 14:29:00 -0500
Subject: [PATCH] netmount: do not handle NFS mounts

NFS mounts should not be handled in netmount, because nfs requires
daemons to run on the client side; the other network file systems we
handle do not have this requirement.

Reported-by: <[e-mail]>
X-Gentoo-Bug: 427996
X-Gentoo-Bug-URL: http://bugs.gentoo.org/show_bug.cgi?id=427996
---
 init.d/netmount.in |   86 +++++++++++++--------------------------------------
 1 files changed, 22 insertions(+), 64 deletions(-)

diff --git a/init.d/netmount.in b/init.d/netmount.in
index 2259783..6f70f04 100644
--- a/init.d/netmount.in
+++ b/init.d/netmount.in
@@ -4,81 +4,25 @@
 
 description="Mounts network shares according to /etc/fstab."
 
-need_portmap()
-{
-	local opts=
-	local IFS="
-"
-	set -- $(fstabinfo --options --fstype nfs,nfs4)
-	for opts; do
-		case ,$opts, in
-			*,noauto,*|*,nolock,*);;
-			*) return 0;;
-		esac
-	done
-	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
-	# that is set to mount at boot
-	local pmap=
-	if need_portmap; then
-		pmap="rpc.statd"
-		[ -x @SYSCONFDIR@/init.d/rpcbind ] \
-			&& pmap="$pmap rpcbind" \
-			|| 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
+	need net
 	use afc-client amd autofs openvpn
-	use dns nfs nfsmount portmap rpcbind rpc.statd rpc.lockd
+	use dns
 	keyword -jail -prefix -vserver
 }
 
 start()
 {
-	local myneed= myuse= pmap="portmap" nfsmounts=
-	[ -x @SYSCONFDIR@/init.d/rpcbind ] && pmap="rpcbind"
-
 	local x= fs= rc=
 	for x in $net_fs_list $extra_net_fs_list; do
 		case "$x" in
 			nfs|nfs4)
-			# If the nfsmount script took care of the nfs
-			# filesystems, then there's no point in trying
-			# them twice
-			service_started nfsmount && continue
-
-			# Only try to mount NFS filesystems if portmap was
-			# started. This is to fix "hang" problems for new
-			# users who do not add portmap to the default runlevel.
-			if need_portmap && ! service_started "$pmap"; then
-				continue
-			fi
+			# We do not handle NFS file systems here, because NFS
+			# requires daemons on the client side, so we allow nfs-utils
+			# to handle that.
+			continue
 			;;
 		esac
 		fs="$fs${fs:+,}$x"
@@ -103,7 +47,14 @@ stop()
 	. "$RC_LIBEXECDIR"/sh/rc-mount.sh
 
 	for x in $net_fs_list $extra_net_fs_list; do
-		fs="$fs${fs:+,}$x"
+		case "$x" in
+			nfs|nfs4)
+				continue
+				;;
+			*)
+				fs="$fs${fs:+,}$x"
+				;;
+		esac
 	done
 	if [ -n "$fs" ]; then
 		umount -at $fs || eerror "Failed to simply unmount filesystems"
@@ -112,7 +63,14 @@ stop()
 	eindent
 	fs=
 	for x in $net_fs_list $extra_net_fs_list; do
-		fs="$fs${fs:+|}$x"
+		case "$x" in
+			nfs|nfs4)
+				continue
+				;;
+			*)
+				fs="$fs${fs:+|}$x"
+				;;
+		esac
 	done
 	[ -n "$fs" ] && fs="^($fs)$"
 	do_unmount umount ${fs:+--fstype-regex} $fs --netdev
-- 
1.7.8.6