[gentoo-commits] gentoo-x86 commit in net-fs/nfs-utils/files: nfsclient.initd nfsclient.confd

[gentoo-commits] gentoo-x86 commit in net-fs/nfs-utils/files: nfsclient.initd nfsclient.confd

[William Hubbs (williamh)]

williamh    15/02/05 04:32:41

  Modified:             nfsclient.initd nfsclient.confd
  Log:
  Fix the dependencies in nfsclient. There is no good way to detect whether the file systems are nfs3 or nfs4, so explain to the users what they need to turn on or off in the configuration file. Also remove the before netmount line; netmount should use nfsclient.
  
  (Portage version: 2.2.15/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 0x30C46538)

Revision  Changes    Path
1.5                  net-fs/nfs-utils/files/nfsclient.initd

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/files/nfsclient.initd?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/files/nfsclient.initd?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/files/nfsclient.initd?r1=1.4&r2=1.5

Index: nfsclient.initd
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfsclient.initd,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- nfsclient.initd	3 Feb 2015 19:28:36 -0000	1.4
+++ nfsclient.initd	5 Feb 2015 04:32:41 -0000	1.5
@@ -1,25 +1,21 @@
 #!/sbin/runscript
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfsclient.initd,v 1.4 2015/02/03 19:28:36 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfsclient.initd,v 1.5 2015/02/05 04:32:41 williamh Exp $
 
 [ -e /etc/conf.d/nfs ] && . /etc/conf.d/nfs
 
 depend() {
 	local opts myneed=""
 	if [ -e /etc/fstab ] ; then
-		fstabinfo -t nfs4 -q && myneed="$myneed rpc.idmapd"
-		fstabinfo -t nfs -q && myneed="$myneed rpc.statd"
-
 		for opts in $(fstabinfo -o -t nfs,nfs4) ; do
 			case $opts in
 				*sec=krb*|*sec=spkm*) myneed="$myneed rpc.gssd" ;;
 			esac
 		done
 	fi
-	before netmount
 	config /etc/fstab
-	need portmap ${myneed}
+	need portmap rpc.statd rpc.idmapd ${myneed}
 	use ypbind dns
 }
 



1.2                  net-fs/nfs-utils/files/nfsclient.confd

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/files/nfsclient.confd?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/files/nfsclient.confd?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/files/nfsclient.confd?r1=1.1&r2=1.2

Index: nfsclient.confd
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfsclient.confd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nfsclient.confd	22 Dec 2014 19:24:28 -0000	1.1
+++ nfsclient.confd	5 Feb 2015 04:32:41 -0000	1.2
@@ -1,3 +1,14 @@
+# You need to decide which nfs protocol version you want to use.
+# If you are unsure, leave these alone.
+#
+# If you are using only nfsv4, uncomment this line:
+#
+#rc_need="!rpc.statd"
+#
+# If you are using only nfsv3, uncomment this line:
+#
+#rc_need="!rpc.idmapd"
+# 
 # You will need to set the dependencies in the nfsclient script to match
 # the network configuration tools you are using. This should be done in
 # this file by following the examples below, and not by changing the