diff options
author | Mike Frysinger <vapier@gentoo.org> | 2013-03-24 20:29:48 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2013-03-24 20:29:48 +0000 |
commit | e5c4a7b9c53c806e35b37e3a487f168726f5bdc1 (patch) | |
tree | 67bfdac93198b4796df8ab722fa8e1cff9825b0c /net-fs | |
parent | Remove old (diff) | |
download | gentoo-2-e5c4a7b9c53c806e35b37e3a487f168726f5bdc1.tar.gz gentoo-2-e5c4a7b9c53c806e35b37e3a487f168726f5bdc1.tar.bz2 gentoo-2-e5c4a7b9c53c806e35b37e3a487f168726f5bdc1.zip |
Move net usage to conf.d (defaults are unchanged) #439660 by Matthew Schultz.
(Portage version: 2.2.0_alpha169/cvs/Linux x86_64, signed Manifest commit with key FB7C4156)
Diffstat (limited to 'net-fs')
-rw-r--r-- | net-fs/nfs-utils/ChangeLog | 6 | ||||
-rw-r--r-- | net-fs/nfs-utils/files/nfsmount.confd | 7 | ||||
-rwxr-xr-x | net-fs/nfs-utils/files/nfsmount.initd | 6 | ||||
-rw-r--r-- | net-fs/nfs-utils/nfs-utils-1.2.6.ebuild | 6 |
4 files changed, 19 insertions, 6 deletions
diff --git a/net-fs/nfs-utils/ChangeLog b/net-fs/nfs-utils/ChangeLog index 86995c247e8f..879f822d6844 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-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.211 2013/03/24 20:22:10 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.212 2013/03/24 20:29:48 vapier Exp $ + + 24 Mar 2013; Mike Frysinger <vapier@gentoo.org> +files/nfsmount.confd, + files/nfsmount.initd, nfs-utils-1.2.6.ebuild: + Move net usage to conf.d (defaults are unchanged) #439660 by Matthew Schultz. 24 Mar 2013; Mike Frysinger <vapier@gentoo.org> +files/nfs-utils-1.2.7-nfsiostat-python3.patch, nfs-utils-1.2.6.ebuild: diff --git a/net-fs/nfs-utils/files/nfsmount.confd b/net-fs/nfs-utils/files/nfsmount.confd new file mode 100644 index 000000000000..418353668f97 --- /dev/null +++ b/net-fs/nfs-utils/files/nfsmount.confd @@ -0,0 +1,7 @@ +# You will need to set the dependencies in the nfsmount script to match +# the network configuration tools you are using. This should be done in +# this file by following the examples below, and not by changing the +# service script itself. See /etc/conf.d/netmount for more examples. +# +# This is a safe default. +rc_after="net" diff --git a/net-fs/nfs-utils/files/nfsmount.initd b/net-fs/nfs-utils/files/nfsmount.initd index 62bf0284b714..6bb1009982a3 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-2009 Gentoo Foundation +# Copyright 1999-2013 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.14 2010/06/28 21:03:11 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfsmount.initd,v 1.15 2013/03/24 20:29:48 vapier Exp $ [ -e /etc/conf.d/nfs ] && . /etc/conf.d/nfs @@ -20,7 +20,7 @@ depend() { )" fi config /etc/fstab - need net portmap rpc.statd ${myneed} + need portmap rpc.statd ${myneed} use ypbind dns rpc.idmapd rpc.gssd } diff --git a/net-fs/nfs-utils/nfs-utils-1.2.6.ebuild b/net-fs/nfs-utils/nfs-utils-1.2.6.ebuild index d2f73860665a..a3cddcc87c15 100644 --- a/net-fs/nfs-utils/nfs-utils-1.2.6.ebuild +++ b/net-fs/nfs-utils/nfs-utils-1.2.6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 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.2.6.ebuild,v 1.13 2013/03/24 20:22:10 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.2.6.ebuild,v 1.14 2013/03/24 20:29:48 vapier Exp $ EAPI="4" @@ -109,7 +109,9 @@ src_install() { for f in nfs nfsmount rpc.statd ${list} ; do newinitd "${FILESDIR}"/${f}.initd ${f} done - newconfd "${FILESDIR}"/nfs.confd nfs + for f in nfs nfsmount ; do + newconfd "${FILESDIR}"/${f}.confd ${f} + done sed -i \ -e "/^NFS_NEEDED_SERVICES=/s:=.*:=\"${opt_need}\":" \ "${ED}"/etc/conf.d/nfs || die #234132 |