diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2010-08-02 11:08:49 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2010-08-02 11:08:49 +0000 |
| commit | 464acef4adb131d7be12fad0e5cb5fb5790d324b (patch) | |
| tree | 3471cec398f43affa5b6b7038cc3a9af44034854 /net-fs | |
| parent | Automated update of use.local.desc (diff) | |
| download | gentoo-2-464acef4adb131d7be12fad0e5cb5fb5790d324b.tar.gz gentoo-2-464acef4adb131d7be12fad0e5cb5fb5790d324b.tar.bz2 gentoo-2-464acef4adb131d7be12fad0e5cb5fb5790d324b.zip | |
Only require rpc.svcgssd if sec=krb is used rather than sec=sys (default). Thanks to Jared in bug #330795.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'net-fs')
| -rw-r--r-- | net-fs/nfs-utils/ChangeLog | 6 | ||||
| -rwxr-xr-x | net-fs/nfs-utils/files/nfs.initd | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/net-fs/nfs-utils/ChangeLog b/net-fs/nfs-utils/ChangeLog index a548d4b33533..127facf22de5 100644 --- a/net-fs/nfs-utils/ChangeLog +++ b/net-fs/nfs-utils/ChangeLog @@ -1,6 +1,10 @@ # 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.170 2010/07/26 01:02:06 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.171 2010/08/02 11:08:49 flameeyes Exp $ + + 02 Aug 2010; Diego E. Pettenò <flameeyes@gentoo.org> files/nfs.initd: + Only require rpc.svcgssd if sec=krb is used rather than sec=sys (default). + Thanks to Jared in bug #330795. 26 Jul 2010; Diego E. Pettenò <flameeyes@gentoo.org> files/nfs.initd: Fix nfs init script dependency generation for kerberos exports. diff --git a/net-fs/nfs-utils/files/nfs.initd b/net-fs/nfs-utils/files/nfs.initd index 20a1f80a8a2f..e0c4821738cc 100755 --- a/net-fs/nfs-utils/files/nfs.initd +++ b/net-fs/nfs-utils/files/nfs.initd @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfs.initd,v 1.20 2010/07/26 01:02:07 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfs.initd,v 1.21 2010/08/02 11:08:49 flameeyes Exp $ opts="reload" @@ -18,7 +18,7 @@ smnotify=/usr/sbin/sm-notify depend() { local myneed="" if [ -e /etc/exports ] ; then - if awk '!/^[[:space:]]*#/ && $2 ~ /sec=/ { found=1; nextfile } END { exit !found }' /etc/exports ; then + if awk '!/^[[:space:]]*#/ && $2 ~ /sec=krb5/ { found=1; nextfile } END { exit !found }' /etc/exports ; then myneed="${myneed} rpc.svcgssd" fi fi |