saving uncommitted changes in /etc prior to emerge run

diff --git a/conf.d/nfs b/conf.d/nfs
index 60ed5d8a74c88957eb519867316550eb167470a7..2841688ddcebb972563adf5c518673477e217336 100644 (file)
--- a/conf.d/nfs
+++ b/conf.d/nfs
@@ -7,7 +7,7 @@
 # For NFSv4 users, you'll want to add "rpc.idmapd" here.
 NFS_NEEDED_SERVICES="rpc.idmapd"
 
-# Number of servers to be started up by default
+# Options to pass to rpc.nfsd
 OPTS_RPC_NFSD="8"
 
 # Options to pass to rpc.mountd

diff --git a/init.d/nfs b/init.d/nfs
index e4239b70c470215d482b71e750d08c4cd6a227d2..73be4e5b1ea7b512904a991518e8f3a0520c6400 100755 (executable)
--- a/init.d/nfs
+++ b/init.d/nfs
@@ -1,7 +1,7 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
 # Copyright 1999-2014 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.28 2014/06/20 06:21:22 vapier Exp $
+# $Id$
 
 extra_started_commands="reload"
 

diff --git a/init.d/nfsclient b/init.d/nfsclient
index 72ba9a96303539610b3207360220f3b2f54a9912..16060fe858dfd4e8dfd4ecff124906736faff235 100755 (executable)
--- a/init.d/nfsclient
+++ b/init.d/nfsclient
@@ -1,7 +1,7 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfsclient.initd,v 1.5 2015/02/05 04:32:41 williamh Exp $
+# $Id$
 
 [ -e /etc/conf.d/nfs ] && . /etc/conf.d/nfs
 

diff --git a/init.d/nfsmount b/init.d/nfsmount
index 4d4456c9861b43a16fd723c5c1e95b2aea9898a3..bff761c8f0fe60607f8ed545367a1d802ddaf1d9 100755 (executable)
--- a/init.d/nfsmount
+++ b/init.d/nfsmount
@@ -1,7 +1,7 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
 # Copyright 1999-2015 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-1.3.1,v 1.1 2015/02/02 17:45:45 robbat2 Exp $
+# $Id$
 
 # This is mostly as a fix for bug #537996, to avoid breaking existing users
 # with nfsmount in their runlevels.
@@ -10,18 +10,18 @@
 # forthcoming, but requires feature development, see bug #406021 for soft
 # dependencies
 depend() {
-  need nfsclient netmount
+       need nfsclient netmount
 }
 
 msg() {
-  ewarn "nfsmount is deprecated, please migrate as described in the news item: 2015-02-02-nfs-service-changes"
-  ewarn "This migration script will be removed not sooner than 2015/August/01"
+       ewarn "nfsmount is deprecated, please migrate as described in the news item: 2015-02-02-nfs-service-changes"
+       ewarn "This migration script will be removed after 01 Aug 2015."
 }
 
 start() {
-  msg 
+       msg
 }
 
 stop() {
-  msg
+       msg
 }

diff --git a/init.d/rpc.gssd b/init.d/rpc.gssd
index f1b8f87745646882a408a9ab9f9522e751cae8af..7bfbdfa991702b7af1d505df14a32e05181e4d9c 100755 (executable)
--- a/init.d/rpc.gssd
+++ b/init.d/rpc.gssd
@@ -1,7 +1,7 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/rpc.gssd.initd,v 1.11 2008/10/26 09:02:47 vapier Exp $
+# $Id$
 
 [ -e /etc/conf.d/nfs ] && . /etc/conf.d/nfs
 

diff --git a/init.d/rpc.idmapd b/init.d/rpc.idmapd
index 52838b5da76d03f5d40aa6ee282ac41493e478a9..b54369652dbbc20b3431188137c9fb8d7f720e58 100755 (executable)
--- a/init.d/rpc.idmapd
+++ b/init.d/rpc.idmapd
@@ -1,7 +1,7 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/rpc.idmapd.initd,v 1.8 2009/03/14 18:43:18 vapier Exp $
+# $Id$
 
 [ -e /etc/conf.d/nfs ] && . /etc/conf.d/nfs
 

diff --git a/init.d/rpc.pipefs b/init.d/rpc.pipefs
index ebae3b91582a2310f636e2c9c359180daf615132..991c9f59b78928c602425a0cf897393c97d64b2a 100755 (executable)
--- a/init.d/rpc.pipefs
+++ b/init.d/rpc.pipefs
@@ -1,7 +1,7 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/rpc.pipefs.initd,v 1.3 2014/06/20 04:33:57 vapier Exp $
+# $Id$
 
 MNT="/var/lib/nfs/rpc_pipefs"
 

diff --git a/init.d/rpc.statd b/init.d/rpc.statd
index c82041a4d20367f990fbd9c6236a2fdac9b5b1d3..eee9923c745b08b33319ed3a0796781b5321af01 100755 (executable)
--- a/init.d/rpc.statd
+++ b/init.d/rpc.statd
@@ -1,7 +1,7 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/rpc.statd.initd,v 1.9 2015/02/02 13:47:41 radhermit Exp $
+# $Id$
 
 [ -e /etc/conf.d/nfs ] && . /etc/conf.d/nfs
 

diff --git a/init.d/rpc.svcgssd b/init.d/rpc.svcgssd
index 74383e24dbafda77799360962f4d4134489a0316..354c398f084addfad35fd61fcbcce97645f2797f 100755 (executable)
--- a/init.d/rpc.svcgssd
+++ b/init.d/rpc.svcgssd
@@ -1,7 +1,7 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/rpc.svcgssd.initd,v 1.5 2008/10/26 09:02:47 vapier Exp $
+# $Id$
 
 [ -e /etc/conf.d/nfs ] && . /etc/conf.d/nfs