diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2008-04-20 00:06:29 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2008-04-20 00:06:29 +0000 |
| commit | e9af07667eef850310a833f2f46280df2a29255e (patch) | |
| tree | 8b1339296b525846cc999d50d201a61a6f99d509 /net-fs | |
| parent | Add reference to bug #189590 to ChangeLog. (diff) | |
| download | historical-e9af07667eef850310a833f2f46280df2a29255e.tar.gz historical-e9af07667eef850310a833f2f46280df2a29255e.tar.bz2 historical-e9af07667eef850310a833f2f46280df2a29255e.zip | |
Fix nfs4/idmapd detection #213384 by Marek Szuba.
Package-Manager: portage-2.2_pre5
Diffstat (limited to 'net-fs')
| -rw-r--r-- | net-fs/nfs-utils/ChangeLog | 5 | ||||
| -rw-r--r-- | net-fs/nfs-utils/Manifest | 10 | ||||
| -rwxr-xr-x | net-fs/nfs-utils/files/nfsmount.initd | 4 |
3 files changed, 11 insertions, 8 deletions
diff --git a/net-fs/nfs-utils/ChangeLog b/net-fs/nfs-utils/ChangeLog index e81cb1ce49b4..1f78d6f6fd76 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-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.118 2008/01/14 09:56:54 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.119 2008/04/20 00:06:28 vapier Exp $ + + 20 Apr 2008; Mike Frysinger <vapier@gentoo.org> files/nfsmount.initd: + Fix nfs4/idmapd detection #213384 by Marek Szuba. 14 Jan 2008; Mike Frysinger <vapier@gentoo.org> files/nfs.initd, files/nfsmount.initd: diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest index c4de2a654c18..c26bbdbdb46e 100644 --- a/net-fs/nfs-utils/Manifest +++ b/net-fs/nfs-utils/Manifest @@ -8,7 +8,7 @@ AUX nfs.confd 630 RMD160 3628b5df5589c700905afc8054d1ee22fb5be0b9 SHA1 b5e8e37f3 AUX nfs.confd.old 533 RMD160 bad552a256a86bc374cd7ff3d685afa4ff5d816e SHA1 43fbdfba5a61ad79375265c120fb4784da7b1462 SHA256 a9b8395590b8d15b52eee8cb637fdc23afce007de42442ef4448e76f2ac899fd AUX nfs.initd 3998 RMD160 016ab4ae60bdf5e6a9a9b54343fe20226e5967fc SHA1 d969464b5581eb03333d01bb81aaa76833e8b695 SHA256 5a04a97d1b2a33c11c7de09efc844526ec97ca6b15bee0cf156fe1bae2f9391f AUX nfsmount 1131 RMD160 f67431f36e702c50c67ff799d96c8bd37fbe847f SHA1 c88b592db4304f4d19798c1c2346ea688c9acde2 SHA256 8c1b12047327d707743bc579151ff7e3800696cc46cfcaea1c58a93fbc11f9e7 -AUX nfsmount.initd 1114 RMD160 23e51c571983cf6d7fac5bb43b9b112c10866f5f SHA1 e2c3f98940bdc7b33e74a8987ea2212fb673969f SHA256 dcad18c72379bc8088f4257492b84ff4a59c6596d0d84156b17661fefd403981 +AUX nfsmount.initd 1114 RMD160 ec8d2c3006773ead96e83685e45104ed1b42d22d SHA1 d77514af7980041a3b126206e764f5f9c48899ae SHA256 8e17646a90800d3ff81f45e20c5e8c6d81cc2dbfc563788da9659525cf7b713d AUX rpc.gssd.initd 1098 RMD160 a32442dfcddd59bd73e0ab7847c64dfeaf85f423 SHA1 e612f1bc1fc000f89ee3f5348c1d7e8aa0721e7b SHA256 599fb67adb9aac9a7d79ab185d058f8f2d25988a83fcb73a54b4d9e0b79ac6e9 AUX rpc.idmapd.initd 1093 RMD160 445906d112d3794dfd8d9292f89bb562d5447779 SHA1 76256b3ac313a7a69e977631def7b7ff0fea77ff SHA256 c21d4ba7c00487cb45f486971dde036f3a704a888bf879e8017880d1a0800bc1 AUX rpc.statd.initd 858 RMD160 bb8cce615ce75ab478b034e32ebd571e01f03296 SHA1 4e282980452400a11eeff64db2f6988a25316ac2 SHA256 85f6bb77f8fc4ffabf1b2a111c631f0bd2e603e8f80170bf8bd0db074c10fcb0 @@ -21,12 +21,12 @@ EBUILD nfs-utils-1.0.12-r1.ebuild 2853 RMD160 c85a60d376630bf9f1bbb31b4f1f0b1a89 EBUILD nfs-utils-1.0.12-r5.ebuild 3069 RMD160 19926271be7634c6bd4494bf8cd7f05b5497b4f5 SHA1 b4058ab723ed620634661773b68fb2bea857759c SHA256 f8d1f87a679d0263be717a2a0d8f397d3f777f16f8b317492fe7d5b996a8868d EBUILD nfs-utils-1.1.0-r1.ebuild 3098 RMD160 3341a1bb0dab4fe01725cf54bb4398df046d9674 SHA1 70e7f7ad52bcf9b7c69168a0685b54cba99f84b6 SHA256 e32ee25657ff84823b6baed0c94fe5f0b2248e28d1bbad83ae27cfb1109f1e02 EBUILD nfs-utils-1.1.1.ebuild 3427 RMD160 f7de6685b55a98f7bf9d278406a1b0576a95c338 SHA1 73c73a361ffd1fe33829210dcf61b398f79f44cf SHA256 8c9f6fb84710beecd856dcdd8a01f5f39d14212ef42f4d68032bf04ae1795341 -MISC ChangeLog 17805 RMD160 9ea97379088c2cb221b0379c741368c0768a0d87 SHA1 d414dcd6244a417e18b7b8c4ef714ed33c8453e9 SHA256 5d67ffece320d3bf06f49ff3ab6b46f18d79a418ad85f6859482079bd40c5258 +MISC ChangeLog 17930 RMD160 5af61bb34fe9abf45343b71ffae7361ce1b54975 SHA1 ddb7fe3810c4201886d1fe70197f8bf5f293b8b9 SHA256 368ab9aa7c3f56f47d1cf456fbd1cabbd81bad6fa5e806e8126c60d053915f7e MISC metadata.xml 225 RMD160 477581252d7edf18d7b8a274766e2ed04c61935a SHA1 02c4f79d48d465ad7bca76f706d0f7cb7dd039df SHA256 42f511d0cc6e82e29b011c686ba8bb7965f4d92eb6e47ba3e63d4c7edfe9883a -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.7 (GNU/Linux) -iD8DBQFHp49Xj9hvisErhMIRAu2tAKDJ7b7WghMhUJWEYaRzCPvesJ1U+gCg2lM4 -F1UP29taRUtpNf8KQ3b3w4o= -=+ynj +iD8DBQFICokJj9hvisErhMIRArecAKCRvhwAd1au2bDpM6tfhr4smep9cgCghtdd +mLIVk6TCfwbshLBOo9qlIIE= +=orms -----END PGP SIGNATURE----- diff --git a/net-fs/nfs-utils/files/nfsmount.initd b/net-fs/nfs-utils/files/nfsmount.initd index a523a95a281d..a4ba1396c724 100755 --- a/net-fs/nfs-utils/files/nfsmount.initd +++ b/net-fs/nfs-utils/files/nfsmount.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/nfsmount.initd,v 1.8 2008/01/14 09:56:55 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfsmount.initd,v 1.9 2008/04/20 00:06:29 vapier Exp $ [ -e /etc/conf.d/nfs ] && . /etc/conf.d/nfs @@ -10,8 +10,8 @@ depend() { if [ -e /etc/fstab ] ; then 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" + [ ${ret} -ne 2 ] && myneed="${myneed} rpc.idmapd" fi type -t config 2>/dev/null 1>&2 && config /etc/fstab need net portmap rpc.statd ${myneed} |