From e7fd35ad48009dde1670108593e3f3cb86c7461e Mon Sep 17 00:00:00 2001
From: mischief <mischief@offblast.org>
Date: Fri, 6 Mar 2015 09:56:30 -0800
Subject: [PATCH] net-fs/nfs-utils: get rid of exports, old service, and openrc
 condf.d files

---
 .../net-fs/nfs-utils/files/exports            |  1 -
 .../net-fs/nfs-utils/files/nfs.confd          | 38 -------------------
 .../net-fs/nfs-utils/files/nfsd.service       |  3 +-
 .../net-fs/nfs-utils/files/nfsd.service-r1    | 15 --------
 .../net-fs/nfs-utils/files/nfsmount.confd     |  7 ----
 .../net-fs/nfs-utils/files/rpc-mountd.service |  4 +-
 .../nfs-utils/files/rpc-mountd.service-r1     | 10 -----
 .../net-fs/nfs-utils/files/rpc-statd.service  |  5 +--
 .../nfs-utils/files/rpc-statd.service-r1      | 14 -------
 .../nfs-utils/files/rpc-statd.service-r2      | 12 ------
 .../nfs-utils/nfs-utils-1.2.9-r3.ebuild       | 17 ++-------
 11 files changed, 7 insertions(+), 119 deletions(-)
 delete mode 100644 sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/exports
 delete mode 100644 sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/nfs.confd
 delete mode 100644 sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/nfsd.service-r1
 delete mode 100644 sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/nfsmount.confd
 delete mode 100644 sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/rpc-mountd.service-r1
 delete mode 100644 sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/rpc-statd.service-r1
 delete mode 100644 sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/rpc-statd.service-r2

diff --git a/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/exports b/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/exports
deleted file mode 100644
index 5102ef27c1..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/exports
+++ /dev/null
@@ -1 +0,0 @@
-# /etc/exports: NFS file systems being exported.  See exports(5).
diff --git a/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/nfs.confd b/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/nfs.confd
deleted file mode 100644
index d493400855..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/nfs.confd
+++ /dev/null
@@ -1,38 +0,0 @@
-# /etc/conf.d/nfs
-
-# 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"
-
-# Options to pass to rpc.mountd
-# ex. OPTS_RPC_MOUNTD="-p 32767"
-OPTS_RPC_MOUNTD=""
-
-# Options to pass to rpc.statd
-# ex. OPTS_RPC_STATD="-p 32765 -o 32766"
-OPTS_RPC_STATD=""
-
-# Options to pass to rpc.idmapd
-OPTS_RPC_IDMAPD=""
-
-# Options to pass to rpc.gssd
-OPTS_RPC_GSSD=""
-
-# Options to pass to rpc.svcgssd
-OPTS_RPC_SVCGSSD=""
-
-# Options to pass to rpc.rquotad (requires sys-fs/quota)
-OPTS_RPC_RQUOTAD=""
-
-# Timeout (in seconds) for exportfs
-EXPORTFS_TIMEOUT=30
-
-# Options to set in the nfsd filesystem (/proc/fs/nfsd/).
-# Format is <option>=<value>.  Multiple options are allowed.
-#OPTS_NFSD="nfsv4leasetime=30 max_block_size=4096"
diff --git a/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/nfsd.service b/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/nfsd.service
index 80bfacbb68..e15cf98f9b 100644
--- a/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/nfsd.service
+++ b/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/nfsd.service
@@ -5,8 +5,7 @@ Requires=rpcbind.service
 
 [Service]
 Type=oneshot
-EnvironmentFile=/etc/conf.d/nfs
-ExecStart=/usr/sbin/rpc.nfsd $OPTS_RPC_NFSD
+ExecStart=/usr/sbin/rpc.nfsd 8
 ExecStartPost=/usr/sbin/exportfs -a
 ExecStop=/usr/sbin/rpc.nfsd 0
 ExecStopPost=/usr/sbin/exportfs -a -u
diff --git a/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/nfsd.service-r1 b/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/nfsd.service-r1
deleted file mode 100644
index e15cf98f9b..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/nfsd.service-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-Description=NFS server
-After=rpcbind.service
-Requires=rpcbind.service
-
-[Service]
-Type=oneshot
-ExecStart=/usr/sbin/rpc.nfsd 8
-ExecStartPost=/usr/sbin/exportfs -a
-ExecStop=/usr/sbin/rpc.nfsd 0
-ExecStopPost=/usr/sbin/exportfs -a -u
-RemainAfterExit=yes
-
-[Install]
-WantedBy=multi-user.target
diff --git a/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/nfsmount.confd b/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/nfsmount.confd
deleted file mode 100644
index 418353668f..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/nfsmount.confd
+++ /dev/null
@@ -1,7 +0,0 @@
-# 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/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/rpc-mountd.service b/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/rpc-mountd.service
index 0511dde8f3..d5f5b24af3 100644
--- a/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/rpc-mountd.service
+++ b/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/rpc-mountd.service
@@ -4,9 +4,7 @@ After=rpcbind.service nfsd.service
 Requires=rpcbind.service nfsd.service
 
 [Service]
-Type=forking
-EnvironmentFile=/etc/conf.d/nfs
-ExecStart=/usr/sbin/rpc.mountd $OPTS_RPC_MOUNTD
+ExecStart=/usr/sbin/rpc.mountd -F
 
 [Install]
 WantedBy=multi-user.target
diff --git a/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/rpc-mountd.service-r1 b/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/rpc-mountd.service-r1
deleted file mode 100644
index d5f5b24af3..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/rpc-mountd.service-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=NFS Mount Daemon
-After=rpcbind.service nfsd.service
-Requires=rpcbind.service nfsd.service
-
-[Service]
-ExecStart=/usr/sbin/rpc.mountd -F
-
-[Install]
-WantedBy=multi-user.target
diff --git a/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/rpc-statd.service b/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/rpc-statd.service
index 103b6fee06..3633ebded5 100644
--- a/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/rpc-statd.service
+++ b/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/rpc-statd.service
@@ -3,11 +3,10 @@ Description=NFSv2/3 Network Status Monitor Daemon
 After=rpcbind.service
 Requires=rpcbind.service
 Before=remote-fs-pre.target
+Wants=remote-fs-pre.target
 
 [Service]
-Type=forking
-EnvironmentFile=/etc/conf.d/nfs
-ExecStart=/sbin/rpc.statd $OPTS_RPC_STATD
+ExecStart=/sbin/rpc.statd -F
 
 [Install]
 WantedBy=multi-user.target
diff --git a/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/rpc-statd.service-r1 b/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/rpc-statd.service-r1
deleted file mode 100644
index b19eb17f59..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/rpc-statd.service-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=NFSv2/3 Network Status Monitor Daemon
-After=rpcbind.service
-Requires=rpcbind.service
-Before=remote-fs-pre.target
-Wants=remote-fs-pre.target
-
-[Service]
-Type=forking
-EnvironmentFile=/etc/conf.d/nfs
-ExecStart=/sbin/rpc.statd $OPTS_RPC_STATD
-
-[Install]
-WantedBy=multi-user.target
diff --git a/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/rpc-statd.service-r2 b/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/rpc-statd.service-r2
deleted file mode 100644
index 3633ebded5..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/rpc-statd.service-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=NFSv2/3 Network Status Monitor Daemon
-After=rpcbind.service
-Requires=rpcbind.service
-Before=remote-fs-pre.target
-Wants=remote-fs-pre.target
-
-[Service]
-ExecStart=/sbin/rpc.statd -F
-
-[Install]
-WantedBy=multi-user.target
diff --git a/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/nfs-utils-1.2.9-r3.ebuild b/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/nfs-utils-1.2.9-r3.ebuild
index bb42ad64e6..7142d0df2a 100644
--- a/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/nfs-utils-1.2.9-r3.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/nfs-utils-1.2.9-r3.ebuild
@@ -109,21 +109,10 @@ src_install() {
 		doins id_resolver.conf
 	fi
 
-	local f opt_need=""
-	if use nfsv4 ; then
-		opt_need="rpc.idmapd"
-	fi
-	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
-
 	systemd_dotmpfilesd "${FILESDIR}"/nfs-utils.conf
-	systemd_newunit "${FILESDIR}"/nfsd.service-r1 nfsd.service
-	systemd_newunit "${FILESDIR}"/rpc-statd.service-r2 rpc-statd.service
-	systemd_newunit "${FILESDIR}"/rpc-mountd.service-r1 rpc-mountd.service
+	systemd_dounit "${FILESDIR}"/nfsd.service
+	systemd_dounit "${FILESDIR}"/rpc-statd.service
+	systemd_dounit "${FILESDIR}"/rpc-mountd.service
 	systemd_dounit "${FILESDIR}"/rpc-idmapd.service
 	systemd_dounit "${FILESDIR}"/{proc-fs-nfsd,var-lib-nfs-rpc_pipefs}.mount
 	use nfsv4 && use kerberos && systemd_dounit "${FILESDIR}"/rpc-{gssd,svcgssd}.service