diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2008-01-14 09:56:55 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2008-01-14 09:56:55 +0000 |
| commit | 6745d8f0fc535f8107f24987fd37fbbec40580c0 (patch) | |
| tree | 9f97b965347ceb82cdba6e8e3eb7e698a1f4fb20 /net-fs | |
| parent | Stable for x86. See bug 204550. (diff) | |
| download | gentoo-2-6745d8f0fc535f8107f24987fd37fbbec40580c0.tar.gz gentoo-2-6745d8f0fc535f8107f24987fd37fbbec40580c0.tar.bz2 gentoo-2-6745d8f0fc535f8107f24987fd37fbbec40580c0.zip | |
Until newer baselayout stabilizes, only use config() when it exists #203906.
(Portage version: 2.1.4)
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 | ||||
| -rwxr-xr-x | net-fs/nfs-utils/files/nfsmount.initd | 4 |
3 files changed, 9 insertions, 5 deletions
diff --git a/net-fs/nfs-utils/ChangeLog b/net-fs/nfs-utils/ChangeLog index 7763d113ab25..e81cb1ce49b4 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-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.117 2008/01/08 15:07:22 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.118 2008/01/14 09:56:54 vapier Exp $ + + 14 Jan 2008; Mike Frysinger <vapier@gentoo.org> files/nfs.initd, + files/nfsmount.initd: + Until newer baselayout stabilizes, only use config() when it exists #203906. 08 Jan 2008; Raúl Porcel <armin76@gentoo.org> nfs-utils-1.1.0-r1.ebuild: alpha/ia64/sparc stable wrt #201552 diff --git a/net-fs/nfs-utils/files/nfs.initd b/net-fs/nfs-utils/files/nfs.initd index 4b638ca798ad..a5bd05db3a33 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-2007 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.9 2007/12/30 19:25:18 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfs.initd,v 1.10 2008/01/14 09:56:55 vapier Exp $ opts="reload" @@ -22,7 +22,7 @@ depend() { myneed="${myneed} rpc.gssd" fi fi - config /etc/exports + type -t config 2>/dev/null 1>&2 && config /etc/exports need portmap rpc.statd ${myneed} use ypbind net dns rpc.rquotad rpc.idmapd rpc.gssd after quota diff --git a/net-fs/nfs-utils/files/nfsmount.initd b/net-fs/nfs-utils/files/nfsmount.initd index 7d30e5d1019b..a523a95a281d 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.7 2007/12/30 19:25:18 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfsmount.initd,v 1.8 2008/01/14 09:56:55 vapier Exp $ [ -e /etc/conf.d/nfs ] && . /etc/conf.d/nfs @@ -13,7 +13,7 @@ depend() { [ ${ret} -ne 0 ] && myneed="${myneed} rpc.idmapd" [ ${ret} -eq 1 ] && myneed="${myneed} rpc.gssd" fi - config /etc/fstab + type -t config 2>/dev/null 1>&2 && config /etc/fstab need net portmap rpc.statd ${myneed} use ypbind dns rpc.idmapd rpc.gssd } |