diff options
| -rw-r--r-- | net-fs/nfs-utils/ChangeLog | 5 | ||||
| -rwxr-xr-x | net-fs/nfs-utils/files/nfsmount.initd | 4 |
2 files changed, 6 insertions, 3 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/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} |