Have nfs init.d depend on rpc.idmapd by default when USE=nfsv4, but allow people to disable it via conf.d #234132 by roger.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

5 files changed, 23 insertions, 12 deletions

diff --git a/net-fs/nfs-utils/ChangeLog b/net-fs/nfs-utils/ChangeLog
index bcac3c49ade1..9aeba17da75b 100644
--- a/net-fs/nfs-utils/ChangeLog
+++ b/net-fs/nfs-utils/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-fs/nfs-utils
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.157 2009/05/30 21:47:12 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.158 2009/05/30 22:01:42 vapier Exp $
+
+  30 May 2009; Mike Frysinger <vapier@gentoo.org> nfs-utils-1.1.6-r1.ebuild,
+  files/nfs.confd, files/nfs.initd:
+  Have nfs init.d depend on rpc.idmapd by default when USE=nfsv4, but allow
+  people to disable it via conf.d #234132 by roger.
 
   30 May 2009; Mike Frysinger <vapier@gentoo.org>
   +nfs-utils-1.1.6-r1.ebuild, metadata.xml:
diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest
index beb272e93652..5b05555bdbe6 100644
--- a/net-fs/nfs-utils/Manifest
+++ b/net-fs/nfs-utils/Manifest
@@ -6,8 +6,8 @@ AUX nfs-utils-1.1.2-rpcgen-ioctl.patch 398 RMD160 1ff3225a3d4f3dd3e21a9d34f9839e
 AUX nfs-utils-1.1.4-ascii-man.patch 571 RMD160 614759d4a361db8ab6ee8c8ee87fc8a93a5e6052 SHA1 745322de9b26acec667d7acf8764f12388e3a046 SHA256 5f1cd9789b4963df22df914f61a33412d61d3c8fdde9b71b8c9dd4c2506852f7
 AUX nfs-utils-1.1.4-mtab-sym.patch 1020 RMD160 72c6ebb9d02ec544b5b2d7ad3ad0c8035d248eb1 SHA1 50db1976ac25607faf8f003573f9d8529e5b4de6 SHA256 0232799d085151649a1eb1f31644105de7e5cfba888794354005499a0db277c3
 AUX nfs-utils-1.1.4-no-exec.patch 297 RMD160 59e6f4bf2c782c0c107cd135589c4abcba1a5978 SHA1 aa7239b22cf73abb1790bb9a88407cea8fd56779 SHA256 f66af9d046a3524ae8920f8e4b5d0fa206de31d4e7747bfc716a10ac86537b0f
-AUX nfs.confd 630 RMD160 3628b5df5589c700905afc8054d1ee22fb5be0b9 SHA1 b5e8e37f3611008626f3f1fc633202fbefb8c101 SHA256 9ca3b7dfbac5bedd818a3637805380f4e873ef8e809c21c26f410c86ac16e03e
-AUX nfs.initd 4165 RMD160 89bb4520cfb6149f98a97a2f4d5009b42f199761 SHA1 b7b6770fc84d509ccb55e0769b8e701cd5126cc8 SHA256 813ddf4ee84e7cc734dd4375adc6209ed3f629eab6b2370635766139b8f5500b
+AUX nfs.confd 777 RMD160 8c830ee0c1a57e4b2fe35419976b9063080492de SHA1 22e6bf3d6e350b71bed4b827796a36fb964d1455 SHA256 ca1f72dca9934f7bbdd281dde8b1e91c0efad5abf3935dba54cd6ec07e7af315
+AUX nfs.initd 4188 RMD160 37edc15c8ed779a772c1f88c264d3630f61d3eed SHA1 374d2400aa9b24d1397ddb6a95ddb377bc0548cf SHA256 b485797f4ec6f7b89f5c88a2166f069c5030f3ba8ba078180097eb23666f8bfd
 AUX nfsmount.initd 1084 RMD160 7da20dd19d9d6fe8734691eb3219e6bd011737eb SHA1 521a3e95158c76800c396fbe54ef558e01520177 SHA256 f2f5b54fef59f24a1fc6a8b814dfe2cfdeeb02fd0d5041cff31650e626fe4b75
 AUX rpc.gssd.initd 567 RMD160 26d42451b9fc0e90297b5e0381d2632a57dc4c51 SHA1 041e59d915a0ab183a3e0b50abbf58394d2e89b9 SHA256 00d9c29280a83e8458c33139d04a9b38c6fdba9d7cb9b420ca83bf6b10e6435d
 AUX rpc.idmapd.initd 595 RMD160 45f3e7c83555113052a302b66ba160171f90400a SHA1 4c387d27dd11dcfe896dd937c69cd391c1936123 SHA256 3ce65326859c43983dad25ad2d4731488c488037796e39b6b5eda336e8bf81ef
@@ -19,14 +19,14 @@ DIST nfs-utils-1.1.5.tar.bz2 605790 RMD160 9e50867b29184ebe6b6c4fb8fe35b026630d5
 DIST nfs-utils-1.1.6.tar.bz2 598584 RMD160 bb3535325d4a98a7d3b83eb59c3dc9061a4c1457 SHA1 63c0ed078f231a65e3e29a21da094ad2326a0294 SHA256 9c7b4ba94cad4751604c31b9e428b0233b944fcb8ba89eebbd50e78cff73a5d5
 EBUILD nfs-utils-1.1.4-r1.ebuild 3156 RMD160 330c1fe7c37bef31fe1c6b9a22318f52bbf345c2 SHA1 5991452fb4cec1a3e7916ea83b417a78c188dcae SHA256 7887a1a2cab72d7831aa8833ef174f08abe2946cb38ca8b7999c3ffe672caa96
 EBUILD nfs-utils-1.1.5.ebuild 3087 RMD160 5467abd9880234bb3910477824bc37c9c192ad86 SHA1 89bbab2a638de77faa61fd858db8212a8b4bc1cc SHA256 e1d88e780252335b92b07887f79064399dbc306ae2bea29fc7e981293c89abdf
-EBUILD nfs-utils-1.1.6-r1.ebuild 3085 RMD160 65588b92ec8a5725942e5e59cbadf973ae111703 SHA1 b70d6ef8910745d93281a011fd322f5da9c11cfa SHA256 221a5697b11da8575d171dbedf29999bb04404f1079b20d166f6938e1c7ad03c
+EBUILD nfs-utils-1.1.6-r1.ebuild 3201 RMD160 3aefdfb52668a59ddf4f60a318e9fd1b5ebd4e5b SHA1 c75abd47908fe4c594dabaeb8fe1b2fc4f1bf005 SHA256 8d659904a988ab152d4e22f10d5cf9177ba18b3ff94f6c37277e310635c4f7b8
 EBUILD nfs-utils-1.1.6.ebuild 3087 RMD160 de1cd2012bb0ed960bd9f750026ecf68130ce36b SHA1 44c2f8eb0996b4cafae86310c62c86ef32cb0605 SHA256 e6c4be88d00595818a2a1c3b03e3b8d696cb64c0be267e4e7de584f9ee854599
-MISC ChangeLog 24477 RMD160 c217da8f99ee34231a6bbac8a7710fcf1b552357 SHA1 a27a40e4fa080830c51d0e167c8b269aad3d80e7 SHA256 96adbf57dd973625ec28b0fa70790771028c1ad6caa3ddbb66ad0c4ce217fc62
+MISC ChangeLog 24719 RMD160 a1865d71025838197513fc0eacac04c60ca5b4bf SHA1 0085f1433413fc2d35c074b197537ed2c6b25b16 SHA256 bacd0642e5f1e1e63893f357b24c32050761a9d365a4ede8bdbefadba20bfa5c
 MISC metadata.xml 402 RMD160 10e39caa098663bde1b609727598aefc319eb5c2 SHA1 9180287973e77c950e172f055e19e5f94f446621 SHA256 cf9b23e458d8e57e6b3ec4639d2c486032b3313952da2c92166bc5f40409e3f6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkohqQ4ACgkQn/5bYzqsSmEbAgCgtD9ePMFkbZVBuwFKS3gvdHL8
-r4AAoIlUXvZggE8iGfdLsBbrDZZLRvLB
-=a8hy
+iEYEARECAAYFAkohrHIACgkQn/5bYzqsSmFPZwCgyWHyM/ml+RS81xLUyygbFiti
+ZBwAn0GghxNRo9dUM18DdffRAIZEq++F
+=PtSM
 -----END PGP SIGNATURE-----
diff --git a/net-fs/nfs-utils/files/nfs.confd b/net-fs/nfs-utils/files/nfs.confd
index 98a143a654d1..ad9e34f2a912 100644
--- a/net-fs/nfs-utils/files/nfs.confd
+++ b/net-fs/nfs-utils/files/nfs.confd
@@ -3,6 +3,10 @@
 # If you wish to set the port numbers for lockd,
 # please see /etc/sysctl.conf
 
+# Optional services to include in default `/etc/init.d/nfs start`
+# For NFSv4 users, you'll want to add "rpc.idmapd" here.
+NFS_NEEDED_SERVICES=""
+
 # Number of servers to be started up by default
 OPTS_RPC_NFSD="8"
 
diff --git a/net-fs/nfs-utils/files/nfs.initd b/net-fs/nfs-utils/files/nfs.initd
index 78de312df467..6f6ba98ceb94 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-2009 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.18 2009/02/27 01:41:55 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfs.initd,v 1.19 2009/05/30 22:01:43 vapier Exp $
 
 opts="reload"
 
@@ -23,7 +23,7 @@ depend() {
 		fi
 	fi
 	config /etc/exports
-	need portmap rpc.statd ${myneed}
+	need portmap rpc.statd ${myneed} ${NFS_NEEDED_SERVICES}
 	use ypbind net dns rpc.rquotad rpc.idmapd rpc.svcgssd
 	after quota
 }
diff --git a/net-fs/nfs-utils/nfs-utils-1.1.6-r1.ebuild b/net-fs/nfs-utils/nfs-utils-1.1.6-r1.ebuild
index 2148e972ebff..1b27837ea30a 100644
--- a/net-fs/nfs-utils/nfs-utils-1.1.6-r1.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-1.1.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.1.6-r1.ebuild,v 1.1 2009/05/30 21:47:12 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.1.6-r1.ebuild,v 1.2 2009/05/30 22:01:42 vapier Exp $
 
 EAPI="1"
 
@@ -78,8 +78,9 @@ src_install() {
 	insinto /etc
 	doins "${FILESDIR}"/exports
 
-	local f list=""
+	local f list="" opt_need=""
 	if use nfsv4 ; then
+		opt_need="rpc.idmapd"
 		list="${list} rpc.idmapd rpc.pipefs"
 		use kerberos && list="${list} rpc.gssd rpc.svcgssd"
 	fi
@@ -87,6 +88,7 @@ src_install() {
 		newinitd "${FILESDIR}"/${f}.initd ${f} || die "doinitd ${f}"
 	done
 	newconfd "${FILESDIR}"/nfs.confd nfs
+	dosed "/^NFS_NEEDED_SERVICES=/s:=.*:=\"${opt_need}\":" /etc/conf.d/nfs #234132
 
 	# uClibc doesn't provide rpcgen like glibc, so lets steal it from nfs-utils
 	if ! use elibc_glibc ; then