From 05ad8db3ba54478b30a8790fc97401bfa2014447 Mon Sep 17 00:00:00 2001
From: mischief <mischief@offblast.org>
Date: Thu, 5 Mar 2015 15:38:55 -0800
Subject: [PATCH] net-fs/nfs-utils: remove unused .initd files

---
 .../net-fs/nfs-utils/files/nfs.initd          | 163 ------------------
 .../net-fs/nfs-utils/files/nfsmount.initd     |  48 ------
 .../net-fs/nfs-utils/files/rpc.gssd.initd     |  24 ---
 .../net-fs/nfs-utils/files/rpc.idmapd.initd   |  26 ---
 .../net-fs/nfs-utils/files/rpc.pipefs.initd   |  33 ----
 .../net-fs/nfs-utils/files/rpc.statd.initd    |  33 ----
 .../net-fs/nfs-utils/files/rpc.svcgssd.initd  |  24 ---
 .../nfs-utils/nfs-utils-1.2.9-r3.ebuild       |   7 +-
 8 files changed, 1 insertion(+), 357 deletions(-)
 delete mode 100755 sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/nfs.initd
 delete mode 100755 sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/nfsmount.initd
 delete mode 100755 sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/rpc.gssd.initd
 delete mode 100755 sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/rpc.idmapd.initd
 delete mode 100644 sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/rpc.pipefs.initd
 delete mode 100755 sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/rpc.statd.initd
 delete mode 100755 sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/rpc.svcgssd.initd

diff --git a/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/nfs.initd b/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/nfs.initd
deleted file mode 100755
index e4239b70c4..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/nfs.initd
+++ /dev/null
@@ -1,163 +0,0 @@
-#!/sbin/runscript
-# 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 $
-
-extra_started_commands="reload"
-
-# This variable is used for controlling whether or not to run exportfs -ua;
-# see stop() for more information
-restarting=no
-
-# The binary locations
-exportfs=/usr/sbin/exportfs
-  mountd=/usr/sbin/rpc.mountd
-    nfsd=/usr/sbin/rpc.nfsd
-smnotify=/usr/sbin/sm-notify
-
-depend() {
-	local myneed=""
-	# XXX: no way to detect NFSv4 is desired and so need rpc.idmapd
-	myneed="${myneed} $(
-		awk '!/^[[:space:]]*#/ {
-			# clear the path to avoid spurious matches
-			$1 = "";
-			if ($0 ~ /[(][^)]*sec=(krb|spkm)[^)]*[)]/) {
-				print "rpc.svcgssd"
-				exit 0
-			}
-		}' /etc/exports /etc/exports.d/*.exports 2>/dev/null
-	)"
-	config /etc/exports /etc/exports.d/*.exports
-	need portmap rpc.statd ${myneed} ${NFS_NEEDED_SERVICES}
-	use ypbind net dns rpc.rquotad rpc.idmapd rpc.svcgssd
-	after quota
-}
-
-mkdir_nfsdirs() {
-	local d
-	for d in v4recovery v4root ; do
-		d="/var/lib/nfs/${d}"
-		[ ! -d "${d}" ] && mkdir -p "${d}"
-	done
-}
-
-waitfor_exportfs() {
-	local pid=$1
-	( sleep ${EXPORTFS_TIMEOUT:-30}; kill -9 ${pid} 2>/dev/null ) &
-	wait $1
-}
-
-mount_nfsd() {
-	if [ -e /proc/modules ] ; then
-		# Make sure nfs support is loaded in the kernel #64709
-		if ! grep -qs nfsd /proc/filesystems ; then
-			modprobe -q nfsd
-		fi
-		# Restart idmapd if needed #220747
-		if grep -qs nfsd /proc/modules ; then
-			killall -q -HUP rpc.idmapd
-		fi
-	fi
-
-	# This is the new "kernel 2.6 way" to handle the exports file
-	if grep -qs nfsd /proc/filesystems ; then
-		if ! mountinfo -q /proc/fs/nfsd ; then
-			ebegin "Mounting nfsd filesystem in /proc"
-			mount -t nfsd -o nodev,noexec,nosuid nfsd /proc/fs/nfsd
-			eend $?
-		fi
-
-		local o
-		for o in ${OPTS_NFSD} ; do
-			echo "${o#*=}" > "/proc/fs/nfsd/${o%%=*}"
-		done
-	fi
-}
-
-start_it() {
-	ebegin "Starting NFS $1"
-	shift
-	"$@"
-	eend $?
-	ret=$((ret + $?))
-}
-start() {
-	mount_nfsd
-	mkdir_nfsdirs
-
-	# Exportfs likes to hang if networking isn't working.
-	# If that's the case, then try to kill it so the
-	# bootup process can continue.
-	if grep -qs '^[[:space:]]*/' /etc/exports /etc/exports.d/*.exports ; then
-		ebegin "Exporting NFS directories"
-		${exportfs} -r &
-		waitfor_exportfs $!
-		eend $?
-	fi
-
-	local ret=0
-	start_it mountd ${mountd} ${OPTS_RPC_MOUNTD}
-	start_it daemon ${nfsd} ${OPTS_RPC_NFSD}
-	[ -x "${smnotify}" ] && start_it smnotify ${smnotify} ${OPTS_SMNOTIFY}
-	return ${ret}
-}
-
-stop() {
-	local ret=0
-
-	ebegin "Stopping NFS mountd"
-	start-stop-daemon --stop --exec ${mountd}
-	eend $?
-	ret=$((ret + $?))
-
-	# nfsd sets its process name to [nfsd] so don't look for $nfsd
-	ebegin "Stopping NFS daemon"
-	start-stop-daemon --stop --name nfsd --user root --signal 2
-	eend $?
-	ret=$((ret + $?))
-	# in case things don't work out ... #228127
-	rpc.nfsd 0
-
-	# When restarting the NFS server, running "exportfs -ua" probably
-	# isn't what the user wants.  Running it causes all entries listed
-	# in xtab to be removed from the kernel export tables, and the
-	# xtab file is cleared. This effectively shuts down all NFS
-	# activity, leaving all clients holding stale NFS filehandles,
-	# *even* when the NFS server has restarted.
-	#
-	# That's what you would want if you were shutting down the NFS
-	# server for good, or for a long period of time, but not when the
-	# NFS server will be running again in short order.  In this case,
-	# then "exportfs -r" will reread the xtab, and all the current
-	# clients will be able to resume NFS activity, *without* needing
-	# to umount/(re)mount the filesystem.
-	if [ "${restarting}" = no -o "${RC_CMD}" = "restart" ] ; then
-		ebegin "Unexporting NFS directories"
-		# Exportfs likes to hang if networking isn't working.
-		# If that's the case, then try to kill it so the
-		# shutdown process can continue.
-		${exportfs} -ua &
-		waitfor_exportfs $!
-		eend $?
-	fi
-
-	return ${ret}
-}
-
-reload() {
-	# Exportfs likes to hang if networking isn't working.
-	# If that's the case, then try to kill it so the
-	# bootup process can continue.
-	ebegin "Reloading /etc/exports"
-	${exportfs} -r 1>&2 &
-	waitfor_exportfs $!
-	eend $?
-}
-
-restart() {
-	# See long comment in stop() regarding "restarting" and exportfs -ua
-	restarting=yes
-	svc_stop
-	svc_start
-}
diff --git a/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/nfsmount.initd b/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/nfsmount.initd
deleted file mode 100755
index 6bb1009982..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/nfsmount.initd
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/sbin/runscript
-# 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.15 2013/03/24 20:29:48 vapier Exp $
-
-[ -e /etc/conf.d/nfs ] && . /etc/conf.d/nfs
-
-depend() {
-	local myneed=""
-	if [ -e /etc/fstab ] ; then
-		myneed="${myneed} $(
-			awk '!/^[[:space:]]*#/ && ($3 == "nfs" || $3 == "nfs4") {
-					if ($3 == "nfs4")
-						idmapd = "rpc.idmapd"
-					if ($4 ~ /sec=(krb|spkm)/)
-						gssd = "rpc.gssd"
-				}
-				END { print idmapd " " gssd }
-				' /etc/fstab
-			)"
-	fi
-	config /etc/fstab
-	need portmap rpc.statd ${myneed}
-	use ypbind dns rpc.idmapd rpc.gssd
-}
-
-start() {
-	if [ -x /usr/sbin/sm-notify ] ; then
-		ebegin "Starting NFS sm-notify"
-		/usr/sbin/sm-notify ${OPTS_SMNOTIFY}
-		eend $?
-	fi
-
-	# Make sure nfs support is loaded in the kernel #64709
-	if [ -e /proc/modules ] && ! grep -qs 'nfs$' /proc/filesystems ; then
-		modprobe -q nfs
-	fi
-
-	ebegin "Mounting NFS filesystems"
-	mount -a -t nfs,nfs4
-	eend $?
-}
-
-stop() {
-	ebegin "Unmounting NFS filesystems"
-	umount -a -t nfs,nfs4
-	eend $?
-}
diff --git a/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/rpc.gssd.initd b/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/rpc.gssd.initd
deleted file mode 100755
index f1b8f87745..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/rpc.gssd.initd
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/sbin/runscript
-# 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 $
-
-[ -e /etc/conf.d/nfs ] && . /etc/conf.d/nfs
-
-depend() {
-	use ypbind net
-	need portmap rpc.pipefs
-	after quota
-}
-
-start() {
-	ebegin "Starting gssd"
-	start-stop-daemon --start --exec /usr/sbin/rpc.gssd -- ${OPTS_RPC_GSSD}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping gssd"
-	start-stop-daemon --stop --exec /usr/sbin/rpc.gssd
-	eend $?
-}
diff --git a/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/rpc.idmapd.initd b/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/rpc.idmapd.initd
deleted file mode 100755
index 52838b5da7..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/rpc.idmapd.initd
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/sbin/runscript
-# 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 $
-
-[ -e /etc/conf.d/nfs ] && . /etc/conf.d/nfs
-
-rpc_bin=/usr/sbin/rpc.idmapd
-
-depend() {
-	use ypbind net
-	need portmap rpc.pipefs
-	after quota
-}
-
-start() {
-	ebegin "Starting idmapd"
-	${rpc_bin} ${OPTS_RPC_IDMAPD}
-	eend $? "make sure DNOTIFY support is enabled ..."
-}
-
-stop() {
-	ebegin "Stopping idmapd"
-	start-stop-daemon --stop --exec ${rpc_bin}
-	eend $?
-}
diff --git a/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/rpc.pipefs.initd b/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/rpc.pipefs.initd
deleted file mode 100644
index ebae3b9158..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/rpc.pipefs.initd
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/sbin/runscript
-# 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 $
-
-MNT="/var/lib/nfs/rpc_pipefs"
-
-mount_pipefs() {
-	local fstype=rpc_pipefs
-
-	# if things are already mounted, nothing to do
-	mountinfo -q ${MNT} && return 0
-
-	# if rpc_pipefs is not available, try to load sunrpc for it #219566
-	grep -qs ${fstype} /proc/filesystems || modprobe -q sunrpc
-	# if still not available, the `mount` will issue an error for the user
-
-	# now just do it for kicks
-	mkdir -p ${MNT}
-	mount -t ${fstype} ${fstype} ${MNT}
-}
-
-start() {
-	ebegin "Setting up RPC pipefs"
-	mount_pipefs
-	eend $? "make sure you have NFS/SUNRPC enabled in your kernel"
-}
-
-stop() {
-	ebegin "Unmounting RPC pipefs"
-	umount ${MNT}
-	eend $?
-}
diff --git a/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/rpc.statd.initd b/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/rpc.statd.initd
deleted file mode 100755
index 14f8b34db6..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/rpc.statd.initd
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/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/rpc.statd.initd,v 1.7 2009/01/31 22:16:11 vapier Exp $
-
-[ -e /etc/conf.d/nfs ] && . /etc/conf.d/nfs
-
-rpc_bin=/sbin/rpc.statd
-rpc_pid=/var/run/rpc.statd.pid
-
-depend() {
-	use ypbind net
-	need portmap
-	after quota
-}
-
-start() {
-	# Don't start rpc.statd if already started by someone else ...
-	# Don't try and kill it if it's already dead ...
-	if killall -q -0 ${rpc_bin} ; then
-		return 0
-	fi
-
-	ebegin "Starting NFS statd"
-	start-stop-daemon --start --exec ${rpc_bin} -- --no-notify ${OPTS_RPC_STATD}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping NFS statd"
-	start-stop-daemon --stop --exec ${rpc_bin} --pidfile /var/run/rpc.statd.pid
-	eend $?
-}
diff --git a/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/rpc.svcgssd.initd b/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/rpc.svcgssd.initd
deleted file mode 100755
index 74383e24db..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/rpc.svcgssd.initd
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/sbin/runscript
-# 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 $
-
-[ -e /etc/conf.d/nfs ] && . /etc/conf.d/nfs
-
-depend() {
-	use ypbind net
-	need portmap rpc.pipefs
-	after quota
-}
-
-start() {
-	ebegin "Starting svcgssd"
-	start-stop-daemon --start --exec /usr/sbin/rpc.svcgssd -- ${OPTS_RPC_SVCGSSD}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping svcgssd"
-	start-stop-daemon --stop --exec /usr/sbin/rpc.svcgssd
-	eend $?
-}
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 9caf018b4d..07f6ce0049 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
@@ -112,15 +112,10 @@ src_install() {
 	insinto /etc
 	doins "${FILESDIR}"/exports
 
-	local f list=() opt_need=""
+	local f opt_need=""
 	if use nfsv4 ; then
 		opt_need="rpc.idmapd"
-		list+=( rpc.idmapd rpc.pipefs )
-		use kerberos && list+=( rpc.gssd rpc.svcgssd )
 	fi
-	for f in nfs nfsmount rpc.statd "${list[@]}" ; do
-		newinitd "${FILESDIR}"/${f}.initd ${f}
-	done
 	for f in nfs nfsmount ; do
 		newconfd "${FILESDIR}"/${f}.confd ${f}
 	done