diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2010-06-28 21:03:11 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2010-06-28 21:03:11 +0000 |
| commit | 1a817bd894cbfa48a47aa1ff74d9f66042fd86cd (patch) | |
| tree | 0e28b598fc09767e6ee012a9e9767f11c982b376 | |
| parent | Fix gssapi dependencies. (diff) | |
| download | gentoo-2-1a817bd894cbfa48a47aa1ff74d9f66042fd86cd.tar.gz gentoo-2-1a817bd894cbfa48a47aa1ff74d9f66042fd86cd.tar.bz2 gentoo-2-1a817bd894cbfa48a47aa1ff74d9f66042fd86cd.zip | |
Fix idmapd/gssd dep calculation with nfs mounts #324725 by Михаил.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
| -rw-r--r-- | net-fs/nfs-utils/ChangeLog | 5 | ||||
| -rwxr-xr-x | net-fs/nfs-utils/files/nfsmount.initd | 16 |
2 files changed, 15 insertions, 6 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/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} |