diff options
| -rw-r--r-- | net-fs/nfs-utils/ChangeLog | 7 | ||||
| -rw-r--r-- | net-fs/nfs-utils/files/nfs.confd | 4 | ||||
| -rwxr-xr-x | net-fs/nfs-utils/files/nfs.initd | 4 | ||||
| -rw-r--r-- | net-fs/nfs-utils/nfs-utils-1.1.6-r1.ebuild | 6 |
4 files changed, 16 insertions, 5 deletions
diff --git a/net-fs/nfs-utils/ChangeLog b/net-fs/nfs-utils/ChangeLog index bcac3c49ade1..9aeba17da75b 100644 --- a/net-fs/nfs-utils/ChangeLog +++ b/net-fs/nfs-utils/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-fs/nfs-utils # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.157 2009/05/30 21:47:12 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.158 2009/05/30 22:01:42 vapier Exp $ + + 30 May 2009; Mike Frysinger <vapier@gentoo.org> nfs-utils-1.1.6-r1.ebuild, + files/nfs.confd, files/nfs.initd: + Have nfs init.d depend on rpc.idmapd by default when USE=nfsv4, but allow + people to disable it via conf.d #234132 by roger. 30 May 2009; Mike Frysinger <vapier@gentoo.org> +nfs-utils-1.1.6-r1.ebuild, metadata.xml: diff --git a/net-fs/nfs-utils/files/nfs.confd b/net-fs/nfs-utils/files/nfs.confd index 98a143a654d1..ad9e34f2a912 100644 --- a/net-fs/nfs-utils/files/nfs.confd +++ b/net-fs/nfs-utils/files/nfs.confd @@ -3,6 +3,10 @@ # If you wish to set the port numbers for lockd, # please see /etc/sysctl.conf +# Optional services to include in default `/etc/init.d/nfs start` +# For NFSv4 users, you'll want to add "rpc.idmapd" here. +NFS_NEEDED_SERVICES="" + # Number of servers to be started up by default OPTS_RPC_NFSD="8" diff --git a/net-fs/nfs-utils/files/nfs.initd b/net-fs/nfs-utils/files/nfs.initd index 78de312df467..6f6ba98ceb94 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-2009 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.18 2009/02/27 01:41:55 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfs.initd,v 1.19 2009/05/30 22:01:43 vapier Exp $ opts="reload" @@ -23,7 +23,7 @@ depend() { fi fi config /etc/exports - need portmap rpc.statd ${myneed} + need portmap rpc.statd ${myneed} ${NFS_NEEDED_SERVICES} use ypbind net dns rpc.rquotad rpc.idmapd rpc.svcgssd after quota } diff --git a/net-fs/nfs-utils/nfs-utils-1.1.6-r1.ebuild b/net-fs/nfs-utils/nfs-utils-1.1.6-r1.ebuild index 2148e972ebff..1b27837ea30a 100644 --- a/net-fs/nfs-utils/nfs-utils-1.1.6-r1.ebuild +++ b/net-fs/nfs-utils/nfs-utils-1.1.6-r1.ebuild @@ -1,6 +1,6 @@ # 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/nfs-utils-1.1.6-r1.ebuild,v 1.1 2009/05/30 21:47:12 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.1.6-r1.ebuild,v 1.2 2009/05/30 22:01:42 vapier Exp $ EAPI="1" @@ -78,8 +78,9 @@ src_install() { insinto /etc doins "${FILESDIR}"/exports - local f list="" + local f list="" opt_need="" if use nfsv4 ; then + opt_need="rpc.idmapd" list="${list} rpc.idmapd rpc.pipefs" use kerberos && list="${list} rpc.gssd rpc.svcgssd" fi @@ -87,6 +88,7 @@ src_install() { newinitd "${FILESDIR}"/${f}.initd ${f} || die "doinitd ${f}" done newconfd "${FILESDIR}"/nfs.confd nfs + dosed "/^NFS_NEEDED_SERVICES=/s:=.*:=\"${opt_need}\":" /etc/conf.d/nfs #234132 # uClibc doesn't provide rpcgen like glibc, so lets steal it from nfs-utils if ! use elibc_glibc ; then |