Fix idmapd/gssd dep calculation with nfs mounts #324725 by Михаил.

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

3 files changed, 27 insertions, 8 deletions

diff --git a/net-fs/nfs-utils/ChangeLog b/net-fs/nfs-utils/ChangeLog
index 4ee670c45643..0ff9111cea07 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-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.167 2010/04/20 09:33:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.168 2010/06/28 21:03:11 vapier Exp $
+
+  28 Jun 2010; Mike Frysinger <vapier@gentoo.org> files/nfsmount.initd:
+  Fix idmapd/gssd dep calculation with nfs mounts #324725 by Михаил.
 
 *nfs-utils-1.2.2-r1 (20 Apr 2010)
 
diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest
index b86030850d99..f5307896fa71 100644
--- a/net-fs/nfs-utils/Manifest
+++ b/net-fs/nfs-utils/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX exports 66 RMD160 0a61ad40dc321be39fb54d5b9fe717caa714e878 SHA1 52ed6b74643e084cfc17ff4638c2e06c86602034 SHA256 5d6356df546682e2f1a87131d1bb67de9b1f9a34d3a5742343dc64e890cf71d5
 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
@@ -6,7 +9,7 @@ AUX nfs-utils-1.1.4-rpcgen-ioctl.patch 414 RMD160 f07264e24f374d6a65dbc8c2b1dfed
 AUX nfs-utils-1.2.2-optional-libcap.patch 2213 RMD160 7182147365404bc6f4caa676018bfc45b90570ad SHA1 99f09ff9b5590346ef367ee9683bc94272eac2ce SHA256 75135cc2c90aacc7adb43c6ced308099ac5b2d9c8cfcc74d395ead4dc583a75a
 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 nfsmount.initd 1130 RMD160 7ac01f228fcd9539e11cf200a0ba2ed82987a91b SHA1 1f4bfd0155489b6ce2e044f34d057c222202b1bb SHA256 4d6965abb56b72bdcd18cbf900b6e1614d12da6b92b1a5b18727c36eaa131d37
 AUX rpc.gssd.initd 567 RMD160 26d42451b9fc0e90297b5e0381d2632a57dc4c51 SHA1 041e59d915a0ab183a3e0b50abbf58394d2e89b9 SHA256 00d9c29280a83e8458c33139d04a9b38c6fdba9d7cb9b420ca83bf6b10e6435d
 AUX rpc.idmapd.initd 595 RMD160 45f3e7c83555113052a302b66ba160171f90400a SHA1 4c387d27dd11dcfe896dd937c69cd391c1936123 SHA256 3ce65326859c43983dad25ad2d4731488c488037796e39b6b5eda336e8bf81ef
 AUX rpc.pipefs.initd 788 RMD160 9ed8a4511e7ce05c67bc3a4c3c9d81ef0cfb6e45 SHA1 c184ab0c0df8b480e6f2e23dbe8360b99d1411a9 SHA256 d651ad9099ea443282476fcedf52c00f0a274eb6a9e4b58a5838780369206973
@@ -26,5 +29,12 @@ EBUILD nfs-utils-1.2.0.ebuild 3194 RMD160 bcf7cc92eeb36828a3f62ef597f6f2bf20e371
 EBUILD nfs-utils-1.2.1.ebuild 3120 RMD160 c97608ea950bb115875d1c2058112b67e500159c SHA1 06e6b0203540520ce4aed99da5f2dd5575491d40 SHA256 5342652c52e345a17ef3d000a4a78aa0513edf863dad7adaa665975194d9771c
 EBUILD nfs-utils-1.2.2-r1.ebuild 3348 RMD160 5b5ef46d0bc4b45da7a780e98fffa4e4f3c94984 SHA1 5d68576b13b33f75ebb83a011649b3eb37864208 SHA256 9f09802bbd00e511a46db613fcda2b11dda720a9d52ef27ad4b414604eadf6bf
 EBUILD nfs-utils-1.2.2.ebuild 3203 RMD160 203c8a5b8bb5c4a2865b1c0a1d4d48f7205e484f SHA1 2e33c7b1b6242eedf7c321634e3709308e654d10 SHA256 6d1126cf7c519490a3d65207ccb256940b5ecf40f27b0b4ceb288c7da9056c40
-MISC ChangeLog 26516 RMD160 66c850903b642838aaf13f8c046107c3bca2dc88 SHA1 8761b755ad6e755a2eda19916fe2352068e43285 SHA256 bf5a998922d932f8ae14c6ab7e3dd5cffc0bb0a33c17946015cd2c5f28600ac2
+MISC ChangeLog 26664 RMD160 b12c779e110535deb4b3bc659e488a1aa9c46b10 SHA1 9a046e4b3ec292689d6cdea0e2fa8fddab4f1cbe SHA256 95ad70d84eec046709fdeb0c6f96680ec53b57631850638be5044c81d0cdcff9
 MISC metadata.xml 402 RMD160 10e39caa098663bde1b609727598aefc319eb5c2 SHA1 9180287973e77c950e172f055e19e5f94f446621 SHA256 cf9b23e458d8e57e6b3ec4639d2c486032b3313952da2c92166bc5f40409e3f6
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iF4EAREIAAYFAkwpDeYACgkQTwhj9JtAlp66rgD+Nm/2g8fvHejZ3A9lZxeJjoRQ
+jKmPOaGrc6NXBRztxuIA/isxcga8fFVTjOE1ufZope2J7BKhZ443F90DL6fnpGTr
+=UyZ7
+-----END PGP SIGNATURE-----
diff --git a/net-fs/nfs-utils/files/nfsmount.initd b/net-fs/nfs-utils/files/nfsmount.initd
index 9ae2c520d226..62bf0284b714 100755
--- a/net-fs/nfs-utils/files/nfsmount.initd
+++ b/net-fs/nfs-utils/files/nfsmount.initd
@@ -1,17 +1,23 @@
 #!/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/nfsmount.initd,v 1.13 2009/01/31 22:15:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfsmount.initd,v 1.14 2010/06/28 21:03:11 vapier Exp $
 
 [ -e /etc/conf.d/nfs ] && . /etc/conf.d/nfs
 
 depend() {
 	local myneed=""
 	if [ -e /etc/fstab ] ; then
-		awk '!/^[[:space:]]*#/ && $3 == "nfs4" { exit ($4 ~ /sec=krb/ ? 10 : 20) }' /etc/fstab
-		local ret=$?
-		[ ${ret} -eq 10 ] && myneed="${myneed} rpc.gssd"
-		[ ${ret} -eq 20 ] && myneed="${myneed} rpc.idmapd"
+		myneed="${myneed} $(
+			awk '!/^[[:space:]]*#/ && ($3 == "nfs" || $3 == "nfs4") {
+					if ($3 == "nfs4")
+						idmapd = "rpc.idmapd"
+					if ($4 ~ /sec=(krb|spkm)/)
+						gssd = "rpc.gssd"
+				}
+				END { print idmapd " " gssd }
+				' /etc/fstab
+			)"
 	fi
 	config /etc/fstab
 	need net portmap rpc.statd ${myneed}