Only force kerb init.d scripts when the NFSv4 mount needs it #180428 by Maurice Volaski. Load the nfs module in the nfsmount client script, not nfsd.

(Portage version: 2.1.3.6)

3 files changed, 23 insertions, 37 deletions

diff --git a/net-fs/nfs-utils/files/digest-nfs-utils-1.0.12-r4 b/net-fs/nfs-utils/files/digest-nfs-utils-1.0.12-r4
new file mode 100644
index 000000000000..bdb8c3cf47a5
--- /dev/null
+++ b/net-fs/nfs-utils/files/digest-nfs-utils-1.0.12-r4
@@ -0,0 +1,3 @@
+MD5 acf3656cec3872deb597aa7ac13f3c3a nfs-utils-1.0.12.tar.gz 778576
+RMD160 a00dbdae386acf3f969714a1571749182c5a19a8 nfs-utils-1.0.12.tar.gz 778576
+SHA256 67d81a53d84777c733ff8a5cf5f3eed9ecda17fb9f949bc65727c1a3427af8ac nfs-utils-1.0.12.tar.gz 778576
diff --git a/net-fs/nfs-utils/files/nfs.initd b/net-fs/nfs-utils/files/nfs.initd
index 558222b565fb..0c10f385415c 100755
--- a/net-fs/nfs-utils/files/nfs.initd
+++ b/net-fs/nfs-utils/files/nfs.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfs.initd,v 1.5 2007/05/12 11:27:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfs.initd,v 1.6 2007/08/16 23:35:19 vapier Exp $
 
 opts="reload"
 
@@ -16,15 +16,13 @@ exportfs=/usr/sbin/exportfs
 smnotify=/usr/sbin/sm-notify
 
 depend() {
-	local myneed="" myuse=""
-	local nfs_mounts=$(awk '!/^[[:space:]]*#/ && $3=="nfs4" { print $0 }' /etc/fstab)
-	if [ -n "${nfs_mounts}" ] ; then
-		myneed="rpc.idmapd rpc.gssd"
-	else
-		myuse="rpc.idmapd rpc.gssd"
-	fi
-	use ypbind net dns rpc.rquotad ${myuse}
+	local myneed=""
+	awk '!/^[[:space:]]*#/ && $3 == "nfs4" { exit ($4 ~ /sec=krb/ ? 1 : 2) }' /etc/fstab
+	local ret=$?
+	[ ${ret} -ne 0 ] && myneed="${myneed} rpc.idmapd"
+	[ ${ret} -eq 1 ] && myneed="${myneed} rpc.gssd"
 	need portmap rpc.statd ${myneed}
+	use ypbind net dns rpc.rquotad rpc.idmapd rpc.gssd
 	after quota
 }
 
@@ -44,7 +42,7 @@ waitfor_exportfs() {
 mount_nfsd() {
 	# Make sure nfs support is loaded in the kernel #64709
 	if [ -e /proc/modules ] && ! grep -qs nfsd /proc/filesystems ; then
-		modprobe nfsd &> /dev/null
+		modprobe -q nfsd
 	fi
 
 	# This is the new "kernel 2.6 way" to handle the exports file
diff --git a/net-fs/nfs-utils/files/nfsmount.initd b/net-fs/nfs-utils/files/nfsmount.initd
index 7386f8c81ee6..d6a7191f5133 100755
--- a/net-fs/nfs-utils/files/nfsmount.initd
+++ b/net-fs/nfs-utils/files/nfsmount.initd
@@ -1,47 +1,32 @@
 #!/sbin/runscript
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfsmount.initd,v 1.3 2007/05/12 11:27:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfsmount.initd,v 1.4 2007/08/16 23:35:19 vapier Exp $
 
 [ -e /etc/conf.d/nfs ] && . /etc/conf.d/nfs
 
 depend() {
-	local myneed="" myuse=""
-	local nfs_mounts=$(awk '!/^[[:space:]]*#/ && $3=="nfs4" { print $0 }' /etc/fstab)
-	if [ -n "${nfs_mounts}" ] ; then
-		myneed="rpc.idmapd rpc.gssd"
-	else
-		myuse="rpc.idmapd rpc.gssd"
-	fi
+	local myneed=""
+	awk '!/^[[:space:]]*#/ && $3 == "nfs4" { exit ($4 ~ /sec=krb/ ? 1 : 2) }' /etc/fstab
+	local ret=$?
+	[ ${ret} -ne 0 ] && myneed="${myneed} rpc.idmapd"
+	[ ${ret} -eq 1 ] && myneed="${myneed} rpc.gssd"
 	need net portmap rpc.statd ${myneed}
-	use ypbind dns ${myuse}
-}
-
-mount_nfsd() {
-	# Make sure nfs support is loaded in the kernel #64709
-	if [ -e /proc/modules ] && ! grep -qs nfsd /proc/filesystems ; then
-		modprobe nfsd &> /dev/null
-	fi
-
-	# This is the new "kernel 2.6 way" to handle the exports file
-	if grep -qs nfsd /proc/filesystems ; then
-		if ! grep -qs "nfsd /proc/fs/nfs" /proc/mounts ; then
-			ebegin "Mounting nfsd filesystem in /proc"
-			mount -t nfsd -o nodev,noexec,nosuid nfsd /proc/fs/nfs
-			eend $?
-		fi
-	fi
+	use ypbind dns rpc.idmapd rpc.gssd
 }
 
 start() {
-	mount_nfsd
-
 	if [ -x /usr/sbin/sm-notify ] ; then
 		ebegin "Starting NFS sm-notify"
 		/usr/sbin/sm-notify ${OPTS_SMNOTIFY}
 		eend $?
 	fi
 
+	# Make sure nfs support is loaded in the kernel #64709
+	if [ -e /proc/modules ] && ! grep -qs nfsd /proc/filesystems ; then
+		modprobe -q nfs
+	fi
+
 	ebegin "Mounting NFS filesystems"
 	mount -a -t nfs,nfs4
 	eend $?