Archives
Archives
| From: | "Mike Frysinger (vapier)" <vapier@g.o> |
|---|---|
| To: | gentoo-commits@l.g.o |
| Subject: | [gentoo-commits] gentoo-x86 commit in net-fs/nfs-utils/files: nfsmount.initd |
| Date: | Mon, 28 Jun 2010 21:03:15 |
| Message-Id: | 20100628210311.E50322C3ED@corvid.gentoo.org |
| 1 | vapier 10/06/28 21:03:11 |
| 2 | |
| 3 | Modified: nfsmount.initd |
| 4 | Log: |
| 5 | Fix idmapd/gssd dep calculation with nfs mounts #324725 by Михаил. |
| 6 | (Portage version: 2.2_rc67/cvs/Linux x86_64) |
| 7 | |
| 8 | Revision Changes Path |
| 9 | 1.14 net-fs/nfs-utils/files/nfsmount.initd |
| 10 | |
| 11 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/files/nfsmount.initd?rev=1.14&view=markup |
| 12 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/files/nfsmount.initd?rev=1.14&content-type=text/plain |
| 13 | diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/files/nfsmount.initd?r1=1.13&r2=1.14 |
| 14 | |
| 15 | Index: nfsmount.initd |
| 16 | =================================================================== |
| 17 | RCS file: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfsmount.initd,v |
| 18 | retrieving revision 1.13 |
| 19 | retrieving revision 1.14 |
| 20 | diff -u -r1.13 -r1.14 |
| 21 | --- nfsmount.initd 31 Jan 2009 22:15:02 -0000 1.13 |
| 22 | +++ nfsmount.initd 28 Jun 2010 21:03:11 -0000 1.14 |
| 23 | @@ -1,17 +1,23 @@ |
| 24 | #!/sbin/runscript |
| 25 | # Copyright 1999-2009 Gentoo Foundation |
| 26 | # Distributed under the terms of the GNU General Public License v2 |
| 27 | -# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfsmount.initd,v 1.13 2009/01/31 22:15:02 vapier Exp $ |
| 28 | +# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfsmount.initd,v 1.14 2010/06/28 21:03:11 vapier Exp $ |
| 29 | |
| 30 | [ -e /etc/conf.d/nfs ] && . /etc/conf.d/nfs |
| 31 | |
| 32 | depend() { |
| 33 | local myneed="" |
| 34 | if [ -e /etc/fstab ] ; then |
| 35 | - awk '!/^[[:space:]]*#/ && $3 == "nfs4" { exit ($4 ~ /sec=krb/ ? 10 : 20) }' /etc/fstab |
| 36 | - local ret=$? |
| 37 | - [ ${ret} -eq 10 ] && myneed="${myneed} rpc.gssd" |
| 38 | - [ ${ret} -eq 20 ] && myneed="${myneed} rpc.idmapd" |
| 39 | + myneed="${myneed} $( |
| 40 | + awk '!/^[[:space:]]*#/ && ($3 == "nfs" || $3 == "nfs4") { |
| 41 | + if ($3 == "nfs4") |
| 42 | + idmapd = "rpc.idmapd" |
| 43 | + if ($4 ~ /sec=(krb|spkm)/) |
| 44 | + gssd = "rpc.gssd" |
| 45 | + } |
| 46 | + END { print idmapd " " gssd } |
| 47 | + ' /etc/fstab |
| 48 | + )" |
| 49 | fi |
| 50 | config /etc/fstab |
| 51 | need net portmap rpc.statd ${myneed} |