Process /etc/exports.d/*.exports too #459600 by Joakim Tjernlund.

Package-Manager: portage-2.2.0_alpha169/cvs/Linux x86_64
Manifest-Sign-Key: 0xFB7C4156

3 files changed, 35 insertions, 24 deletions

diff --git a/net-fs/nfs-utils/ChangeLog b/net-fs/nfs-utils/ChangeLog
index dafcaaab0688..64bb770d85f1 100644
--- a/net-fs/nfs-utils/ChangeLog
+++ b/net-fs/nfs-utils/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-fs/nfs-utils
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.209 2013/01/01 19:47:00 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.210 2013/03/24 19:37:22 vapier Exp $
+
+  24 Mar 2013; Mike Frysinger <vapier@gentoo.org> files/nfs.initd:
+  Process /etc/exports.d/*.exports too #459600 by Joakim Tjernlund.
 
   01 Jan 2013; Jeroen Roovers <jer@gentoo.org> nfs-utils-1.2.6.ebuild:
   Stable for HPPA (bug #445564).
diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest
index 9c704a64654e..5b86dccbb67b 100644
--- a/net-fs/nfs-utils/Manifest
+++ b/net-fs/nfs-utils/Manifest
@@ -19,7 +19,7 @@ AUX nfs-utils-1.2.6-conditionals.patch 2020 SHA256 3f083ad6efa96110e46df09743a69
 AUX nfs-utils-1.2.6-cross-build.patch 1909 SHA256 847f22436f8f389c390beb9bc99195cad182910eff68769317a5dd9902f8c0ab SHA512 ea2fd45ad9f526a72cbc669cb748268aaed5b4e5f01eec8bdeb143226795a09c305732433958261d1b65302eddb68c104eb89d1ad34718038d8b3b06817ae799 WHIRLPOOL 71e398dc619e2971a0f7a3c9c24d9cc2b3a99c4d49568c3a51ac363265e89a13534b73f8e5a744884aff32c8bfebdbfb78b2635dc19caa527bbd3801dc02cac7
 AUX nfs-utils-1.2.6-osd-install.patch 1726 SHA256 04ee2915fcba7c9d459b0f1b701314ad997e61e6898dda03fe670f63113cf155 SHA512 93f4fcb84f17cb7303dc5804d7767947d26aa33f7a8bb55ad4bffd7bc3bb4a11543963062371b25770887195c218727b1b9dbf2a2d9d4ebcd7dbbbc4be3ff879 WHIRLPOOL 032c131226311800eba29c84e3fb392a31dc5171c55a27fcbd4bdc05d69651e56cd2a81922d63a698fd90f987f0e68090676507eccd760e75349b05720b21f9f
 AUX nfs.confd 948 SHA256 22bba4ee5d58bae422650875c7c8a797a52fc121ddd02d48297c075b8a35401e SHA512 0981f9ea34d5aaf25b558aa1f4c32f6750b657b450d5d22b999e1556b583207c8d88b83f6f803747c56cc70531556f5a8741589125429f93d0bbc73ae31c137e WHIRLPOOL ff6db7d613126c4fd76a6b99dc432a44f086ea22c78a42e3bcb2df04b95c31e9552cb2c080345b71027c71f97b0b7470fd53ffb81502b3f77bc9bb80a38fe9cc
-AUX nfs.initd 4337 SHA256 1a29bd99e30b02b3f0af7438856c83cde23f261f940895841f6154d4f9b244b0 SHA512 287d0891c0b58240c4cf06a9ecd5aae699f6e81673362c064a07c44214904e96a4d2bd39bfebd156f1ff5e2c63822c12473014f1c5c9999249a36f5f40fdfb2e WHIRLPOOL ce85c1934fcb476e3dc6d5ab61a50ab6ace0a6d3dfc02f9d3835d42a035f034a60beb1a829823e3e53bfe97c45f6406395b900a34c13dce91f2287469b3135c9
+AUX nfs.initd 4378 SHA256 8df22f253770a24c6a53ce332d821ab680d0ede18d0e968c1c5d8b3796cb74be SHA512 1577a43b47ebf12261504dd1c9ae564e19d80edc424c4b1e308ac46b12907f6684242284f18a6cd2edafec88c815debf895b6c29d13b9bca59d6d7c883bc1f38 WHIRLPOOL da3762c3467af7d46aef1890aa9c95a85e759c6cab09a5590a00c8f6a37b600a6cf3d4c17b1593a3bc7556ad25bfe001ccabcad70bdc1a2848aa9f842e349d48
 AUX nfsmount.initd 1130 SHA256 4d6965abb56b72bdcd18cbf900b6e1614d12da6b92b1a5b18727c36eaa131d37 SHA512 cd5985fa421947a792345813228d7dcdcda111e85a9b880d823ac9f101ca33e60c0ee7cacc2c5592e170d8ce7a80b914173d9c571d56aa395ea5b2863be5335e WHIRLPOOL fc864032d679a806394f69b936e7b568ae78a2a0e19acf935aedb2870b9c5f1e7ae5149462dee4e9929a9bcc2b742f82d1db729ffa4fa50b805ccbc4405372ae
 AUX rpc.gssd.initd 567 SHA256 00d9c29280a83e8458c33139d04a9b38c6fdba9d7cb9b420ca83bf6b10e6435d SHA512 cd4f763c7cced0eecb03e2d4c8fb1d5fbbddd119a014dee4e9cb881d3750fb01a50daa4475700914785cb1313ceef638b7de4d8dddac90cbab63888cc81938f6 WHIRLPOOL d9f4c381f18b76a2c5b1c0c2adb56b0005264a3230c436d4556c45e13372bea09cf1fc35f02d734cac7081322f72873e46d2b2d451334ad908f14ad7fcd54acc
 AUX rpc.idmapd.initd 595 SHA256 3ce65326859c43983dad25ad2d4731488c488037796e39b6b5eda336e8bf81ef SHA512 624ac8c5a381a0ccc1bb7dfd06c080a9de85a9e94e1d4071a6ef401e1b20f0d05d767be5e85eea374c3a4c29218b3db6013383afa0bdd1a7f61b77260675bfdb WHIRLPOOL f25787957ec201bc97754c7864ada3e2c9be05bda054fc8ebdc29e6ebfa2280419d3dc44f54f71a1adf195f257e6e8292645b55e76006341bff101e5bddec94f
@@ -47,12 +47,22 @@ EBUILD nfs-utils-1.2.3.ebuild 3150 SHA256 b1c484e0cc4b032cd44ff66d9e73866e0dfcea
 EBUILD nfs-utils-1.2.4.ebuild 3737 SHA256 13042431e301d9181e6d8d54fa207a2581f675c3a2cb766c47b7fb6037ca088e SHA512 e0fe6e9ef9441311688e88310194c5cb0bf5ae6053d590eab07ca7469413d4183256d4806dc99d0f512eb4d32ab4736a5b8c60a2dff51a925d50134f14e659bc WHIRLPOOL fdb0e2e9e2648c20f8ca89b8d28dcad0646939640a88a2e900bd3601e374f31c157d1cf33de35c67600fb1773406ce0e722ff6b6bb34f5b4c0694f46b2668553
 EBUILD nfs-utils-1.2.5.ebuild 3515 SHA256 f666cf561ecbfe6e4a5c1eed271957ba296c5b90a1bfefbfc741f033661d952c SHA512 0e944552e2e1f8b74d3f571df541f6577aedcac21ee88c9fb6db88e4fd7cb1455939037322c2633830582a228307fc3835afd74afc59121d2babe23da5c29d92 WHIRLPOOL e4bd59dee38ff4e2b735c9711973bd92fc9a180858d22396f5e1b7af8b3891d6ccec3deab4305d7244cdbf7ca8f97166fcb8462919e500cf0ad8e0f9b542d24a
 EBUILD nfs-utils-1.2.6.ebuild 3636 SHA256 984576901d37d10b036d035724bdbe113d4cb092693118243b4f446178774341 SHA512 abfd83227a85a4762c524b04bc17be67c76ae5e25026b097b7641683267f09d5cd115c264019fdf7944d4609188a1ae66dcfcd13d2099ede3aba6dc848155286 WHIRLPOOL c4b26cb17b9ed5fbd9db8fa6f7b344561f5bb186b3d2a4d4cb1ed27afb85cbf5314734c555af5c1809ab368b21b122141efd019f90ff8ba47312e596fa8c81b6
-MISC ChangeLog 32839 SHA256 23e8adeb7be8008f9fd0d558f1ba172c39f5326cac37aadb684b060e554bec95 SHA512 f5eafd82dca98ab5b41370ee5bd7550b4fb693750f6a253b3db3c2c6648432e199a03e6f01d3716fc6d4c0d06f548f82367dfa6cb7515fbdfb889e5758e9e6d4 WHIRLPOOL 7913b5eaf965d42d02c4cc27d14e6b16f8dff699ed7659bd433d79b692fff606a1a6afc603a3b1f9f24a2995f7ef756aded3a1e14c4b2b0e918583f497544078
+MISC ChangeLog 32978 SHA256 aa5c98f56b4917c70afa60ac1b920f9bc19075da7bbada14935cb8482a9a76a2 SHA512 1ce2c926f930269956f5d9a5e31b9a6466996bafe8557ceabb0cffd2ce9384c1cd2e88971d84887869ed17c7d9e96477bbce257f4d9014744468443408b0dd81 WHIRLPOOL 472e00ab15f39b6837789f7fbb0cc3d2b060b3667fe69a9aef8aa12e6213447f89d531e6c59bb73e59a0aaa6b6ba6ac63c684794e1574e3fc952b5a5b9194764
 MISC metadata.xml 606 SHA256 46f51dc8c661de9ec04d0ad748f8dd69f7c38a3379071f422c203f340dbdc3ea SHA512 6707dc9de25b76cbb0d66275e610059bf9b031861acb3318aacc086f0ee58937ec47e5a5ae93e3cd63042728d73269ca5b1128045127a5bf2b9e0a9533605abf WHIRLPOOL c48ad72c02b88bbe92fd1570a8966816d58ed22ee4c3b5f3609c8595f62eaa6e321cdb20731ecdeabe201ab5be3a3f66ffebe3a7e2b6bf9b5c5636c7060cba1a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlDjPTUACgkQVWmRsqeSphN1ZACfSN3TC6K0gTI/0EyGA/9S6C1x
-SuoAmwbuPiiE9IrJw/FXHTdVj9+Vku+q
-=nc2r
+iQIcBAEBCAAGBQJRT1bzAAoJELEHsLL7fEFW91QP/3je/cm/SzsGW+Ig3aZTRztp
+uaTuCPkj2J9F4JlvygRkT4L5B0xK9QZ7uYJYPmBS14L9dBrFz54sL7lJOV7qu6Kp
+bZKVvq2yycStx5n7PpxhCdZqIkKNbP/3cisgP9Z/PnMXNdEDWcZXabnsk+VYAlOH
+TzWfHjFvJmBzB2KTZiZ2U+nGuL+ttzQkpAVVCsgeIyTzuI2xr0fp1HINp6IRiF0T
+nbiFgnG9wTfWMzjmWUqKN/aaMMzaza7UDkxsGMOBl/8oGSzJhim1I7jGdmlH0ZG1
+8Q/KP2hxuMYtrcNJ4c7FhzzP82sE4W7RCdvU5iMD9Fmwv15QxUhmlmVfqSV9RAvi
+3hxg5D2rP5Z5GKqwI8nSavD3ukDHP+pCIBjuiHY01DMtPbCilOk3LEipEhoWAHcO
+0WH0t3L/IkPT+uFhW6pbETf8+Mj1ZI4rDhrZJI/+ad9VKJLYP5o4XQZ0occ6ys20
+gRgFzSbUdC8C7b+BdhQVWep9AXBWLg60wK66948C5zJndnbBVJul6INI+pMwiVMD
+CowjpV/Z8bVh8EmaoYpRvR1uEM8WH4ID2AuK5vgxIBlDyEmtu0fCkLziFS8E0L5n
+tvNwiy0x1xTOh3tRSOC7ZeemibBTekvbfBHwJ+sRClOXjM4lSZSGS+NR7n3bDicS
+t3gA5XPk0DDSofB/v+3G
+=KfSn
 -----END PGP SIGNATURE-----
diff --git a/net-fs/nfs-utils/files/nfs.initd b/net-fs/nfs-utils/files/nfs.initd
index c99a1bf849e9..ab25b4d18bee 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-2011 Gentoo Foundation
+# Copyright 1999-2013 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.26 2011/09/18 01:51:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfs.initd,v 1.27 2013/03/24 19:37:22 vapier Exp $
 
 extra_started_commands="reload"
 
@@ -17,20 +17,18 @@ smnotify=/usr/sbin/sm-notify
 
 depend() {
 	local myneed=""
-	if [ -e /etc/exports ] ; then
-		# XXX: no way to detect NFSv4 is desired and so need rpc.idmapd
-		myneed="${myneed} $(
-			awk '!/^[[:space:]]*#/ {
-				# clear the path to avoid spurious matches
-				$1 = "";
-				if ($0 ~ /[(][^)]*sec=(krb|spkm)[^)]*[)]/) {
-					print "rpc.svcgssd"
-					exit 0
-				}
-				}' /etc/exports
-			)"
-	fi
-	config /etc/exports
+	# XXX: no way to detect NFSv4 is desired and so need rpc.idmapd
+	myneed="${myneed} $(
+		awk '!/^[[:space:]]*#/ {
+			# clear the path to avoid spurious matches
+			$1 = "";
+			if ($0 ~ /[(][^)]*sec=(krb|spkm)[^)]*[)]/) {
+				print "rpc.svcgssd"
+				exit 0
+			}
+		}' /etc/exports /etc/exports.d/*.exports 2>/dev/null
+	)"
+	config /etc/exports /etc/exports.d/*.exports
 	need portmap rpc.statd ${myneed} ${NFS_NEEDED_SERVICES}
 	use ypbind net dns rpc.rquotad rpc.idmapd rpc.svcgssd
 	after quota
@@ -46,7 +44,7 @@ mkdir_nfsdirs() {
 
 waitfor_exportfs() {
 	local pid=$1
-	( sleep ${EXPORTFS_TIMEOUT:-30}; kill -9 $pid 2>/dev/null ) &
+	( sleep ${EXPORTFS_TIMEOUT:-30}; kill -9 ${pid} 2>/dev/null ) &
 	wait $1
 }
 
@@ -91,7 +89,7 @@ start() {
 	# Exportfs likes to hang if networking isn't working.
 	# If that's the case, then try to kill it so the
 	# bootup process can continue.
-	if grep -qs '^[[:space:]]*/' /etc/exports ; then
+	if grep -qs '^[[:space:]]*/' /etc/exports /etc/exports.d/*.exports ; then
 		ebegin "Exporting NFS directories"
 		${exportfs} -r &
 		waitfor_exportfs $!