major NFS cleanup

23 files changed, 127 insertions, 767 deletions

diff --git a/net-fs/nfs-utils/files/digest-nfs-utils-0.2.1-r3 b/net-fs/nfs-utils/files/digest-nfs-utils-0.2.1-r3
deleted file mode 100644
index 3469e3cc6b9f..000000000000
--- a/net-fs/nfs-utils/files/digest-nfs-utils-0.2.1-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cdf44aadf551e4037fd9c9c69ea75930 nfs-utils-0.2.1.tar.gz 206125
diff --git a/net-fs/nfs-utils/files/digest-nfs-utils-0.3.1-r1 b/net-fs/nfs-utils/files/digest-nfs-utils-0.3.1-r1
deleted file mode 100644
index f4d91c15753e..000000000000
--- a/net-fs/nfs-utils/files/digest-nfs-utils-0.3.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7acac2d055067d48bf5bc4b4d0fc630f nfs-utils-0.3.1.tar.gz 211351
diff --git a/net-fs/nfs-utils/files/digest-nfs-utils-0.3.1-r6 b/net-fs/nfs-utils/files/digest-nfs-utils-0.3.1-r6
deleted file mode 100644
index f4d91c15753e..000000000000
--- a/net-fs/nfs-utils/files/digest-nfs-utils-0.3.1-r6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7acac2d055067d48bf5bc4b4d0fc630f nfs-utils-0.3.1.tar.gz 211351
diff --git a/net-fs/nfs-utils/files/digest-nfs-utils-0.3.1-r7 b/net-fs/nfs-utils/files/digest-nfs-utils-0.3.1-r7
deleted file mode 100644
index f4d91c15753e..000000000000
--- a/net-fs/nfs-utils/files/digest-nfs-utils-0.3.1-r7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7acac2d055067d48bf5bc4b4d0fc630f nfs-utils-0.3.1.tar.gz 211351
diff --git a/net-fs/nfs-utils/files/digest-nfs-utils-0.3.3 b/net-fs/nfs-utils/files/digest-nfs-utils-0.3.3-r1
index c2ca12fabcd9..c2ca12fabcd9 100644
--- a/net-fs/nfs-utils/files/digest-nfs-utils-0.3.3
+++ b/net-fs/nfs-utils/files/digest-nfs-utils-0.3.3-r1
diff --git a/net-fs/nfs-utils/files/exports-0.3.1-r1 b/net-fs/nfs-utils/files/exports-0.3.1-r1
deleted file mode 100644
index 5102ef27c150..000000000000
--- a/net-fs/nfs-utils/files/exports-0.3.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-# /etc/exports: NFS file systems being exported.  See exports(5).
diff --git a/net-fs/nfs-utils/files/exports-0.3.1-r6 b/net-fs/nfs-utils/files/exports-0.3.1-r6
deleted file mode 100644
index 5102ef27c150..000000000000
--- a/net-fs/nfs-utils/files/exports-0.3.1-r6
+++ /dev/null
@@ -1 +0,0 @@
-# /etc/exports: NFS file systems being exported.  See exports(5).
diff --git a/net-fs/nfs-utils/files/exports-0.3.1-r7 b/net-fs/nfs-utils/files/exports-0.3.1-r7
deleted file mode 100644
index 5102ef27c150..000000000000
--- a/net-fs/nfs-utils/files/exports-0.3.1-r7
+++ /dev/null
@@ -1 +0,0 @@
-# /etc/exports: NFS file systems being exported.  See exports(5).
diff --git a/net-fs/nfs-utils/files/nfs b/net-fs/nfs-utils/files/nfs
index a36451761889..4ca44cee8952 100755
--- a/net-fs/nfs-utils/files/nfs
+++ b/net-fs/nfs-utils/files/nfs
@@ -1,47 +1,139 @@
-#!/bin/sh
-#RCUPDATE:3 4:73:This line is required for script management
+#!/sbin/runscript
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfs,v 1.4 2002/04/24 22:18:11 drobbins Exp $
 
-. /etc/rc.d/config/functions
-. /etc/rc.d/config/basic
+#---------------------------------------------------------------------------
+# This script starts/stops the following
+#	 rpc.statd if necessary (also checked by init.d/nfsmount)
+#	 rpd.rquotad
+#	 rpd.nfsd
+#	 rpc.mountd
+#---------------------------------------------------------------------------
 
-SERVICE="nfs"
-EXE="/sbin/nfsd"
-opts="start stop restart"
+# NB: Config is in /etc/conf.d/nfs
 
-start() {
 
-		ebegin "Starting ${SERVICE}"
-	    start-stop-daemon --start --quiet --exec /sbin/rpc.statd 1>&2
-        mount -a -t nfs
-
-		if [ "$NFSSERVER" = "yes" ]
-		then
-		  start-stop-daemon --start --quiet --exec /sbin/exportfs -- -r 1>&2
-		  start-stop-daemon --start --quiet --exec /sbin/rpc.mountd 1>&2
-		  start-stop-daemon --start --quiet --exec /sbin/rpc.nfsd 1>&2
-		fi
-		eend $? "Error starting ${SERVICE}."
+opts="start stop restart reload"
+
+# This variable is used for controlling whether or not to run exportfs -ua;
+# see stop() for more information
+RESTARTING=no
+
+depend() {
+	need net portmap
+}
+
+start_statd() {
+	# Don't start rpc.statd if already started by init.d/nfsmount
+	killall -0 rpc.statd &>/dev/null && return 0
+	ebegin "Starting NFS statd"
+	start-stop-daemon --start --quiet --exec /sbin/rpc.statd 1>&2
+	eend $? "Error starting NFS statd"
 }
 
-stop() {
+stop_statd() {
+	# Don't stop rpc.statd if it's in use by init.d/nfsmount.
+	mount -t nfs | grep -q . && return 0
+	# Make sure it's actually running
+	killall -0 rpc.statd &>/dev/null || return 0
+	# Okay, all tests passed, stop rpc.statd
+	ebegin "Stopping NFS statd"
+	start-stop-daemon --stop --quiet --exec /sbin/rpc.statd 1>&2
+	eend $? "Error stopping NFS statd"
+}
+
+start() {
+	start_statd
+
+	# 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 -q '^/' /etc/exports &>/dev/null; then
+		ebegin "Exporting NFS directories"
+		/sbin/exportfs -r 1>&2 &
+		( sleep 5; kill -9 $! &>/dev/null & )
+		wait
+		eend $? "Error exporting NFS directories"
+	fi
 
-		ebegin "Stopping ${SERVICE}"
-        umount -a -t nfs
+	ebegin "Starting NFS rquotad"
+	start-stop-daemon --start --quiet --exec /sbin/rpc.rquotad 1>&2
+	eend $? "Error starting NFS rquotad"
 
-		if [ "$NFSSERVER" = "yes" ]
-		then
-		  start-stop-daemon --stop --quiet --exec /sbin/exportfs -- -au 1>&2
-		  killall -9 nfsd 1>&2
-		  start-stop-daemon --stop --quiet --exec /sbin/rpc.mountd 1>&2
-		fi
-		start-stop-daemon --stop --quiet --exec /sbin/rpc.statd 1>&2
-		eend $? "Error stopping ${SERVICE}."
+	ebegin "Starting NFS daemon"
+	start-stop-daemon --start --quiet --exec \
+		/sbin/rpc.nfsd -- $RPCNFSDCOUNT 1>&2
+	eend $? "Error starting NFS daemon"
+
+	# Check if we support NFSv3
+	ebegin "Starting NFS mountd"
+	rpcinfo -u localhost nfs 3 &>/dev/null || \
+		RPCMOUNTDOPTS="$RPCMOUNTDOPTS --no-nfs-version 3"
+	start-stop-daemon --start --quiet --exec \
+		/sbin/rpc.mountd -- $RPCMOUNTDOPTS 1>&2
+	eend $? "Error starting NFS mountd"
 }
 
-restart() {
-		stop
-		start
+stop() { 
+	# Don't check NFSSERVER variable since it might have changed,
+	# instead use --oknodo to smooth things over
+	ebegin "Stopping NFS mountd"
+	start-stop-daemon --stop --quiet --oknodo \
+		--exec /sbin/rpc.mountd 1>&2
+	eend $? "Error stopping NFS mountd"
+
+	ebegin "Stopping NFS daemon"
+	start-stop-daemon --stop --quiet --oknodo \
+		--name nfsd --user root --signal 2 1>&2
+	eend $? "Error stopping NFS daemon"
+
+	ebegin "Stopping NFS rquotad"
+	start-stop-daemon --stop --quiet --oknodo \
+		--exec /sbin/rpc.rquotad 1>&2
+	eend $? "Error stopping NFS rquotad"
+
+	# 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 ]; 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
+		# bootup process can continue.
+		/sbin/exportfs -ua 1>&2 &
+		( sleep 5; kill -9 $! &>/dev/null & )
+		wait
+		eend $? "Error unexporting NFS directories"
+	fi
+
+	stop_statd
 }
 
-doservice ${@}
+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"
+	/sbin/exportfs -r 1>&2 &
+	( sleep 5; kill -9 $! &>/dev/null & )
+	wait
+	eend $? "Error exporting NFS directories"
+}
 
+restart() {
+	# See long comment in stop() regarding RESTARTING and exportfs -ua
+	RESTARTING=yes
+	svc_stop
+	svc_start
+}
diff --git a/net-fs/nfs-utils/files/nfs-0.3.1-r1 b/net-fs/nfs-utils/files/nfs-0.3.1-r1
deleted file mode 100644
index 48e359fc0e5e..000000000000
--- a/net-fs/nfs-utils/files/nfs-0.3.1-r1
+++ /dev/null
@@ -1,127 +0,0 @@
-#!/bin/sh
-#RCUPDATE:3 4:74:This line is required for script management
-
-#---------------------------------------------------------------------------
-# This script starts/stops the following
-#    rpc.statd if necessary (also checked by init.d/nfsmount)
-#    rpd.rquotad
-#    rpd.nfsd
-#    rpc.mountd
-#
-# (17 Aug 2001 agriffis)
-#---------------------------------------------------------------------------
-
-# These can be overridden in /etc/rc.d/config/basic if desired
-RPCNFSDCOUNT=8  # Number of servers to be started up by default
-RPCMOUNTDOPTS=
-
-. /etc/rc.d/config/functions
-. /etc/rc.d/config/basic
-
-# This variable is used for controlling whether or not to run exportfs -ua;
-# see stop() for more information
-RESTARTING=no
-
-opts="start stop restart reload"
-
-start_statd() {
-    # Don't start rpc.statd if already started by init.d/nfsmount
-    killall -0 rpc.statd &>/dev/null && return 0
-    ebegin "Starting NFS statd"
-    start-stop-daemon --start --quiet --exec /sbin/rpc.statd 1>&2
-    eend $? "Error starting NFS statd"
-}
-
-stop_statd() {
-    # Don't stop rpc.statd if it's in use by init.d/nfsmount.
-    mount -t nfs | grep -q . && return 0
-    # Make sure it's actually running
-    killall -0 rpc.statd &>/dev/null || return 0
-    # Okay, all tests passed, stop rpc.statd
-    ebegin "Stopping NFS statd"
-    start-stop-daemon --stop --quiet --exec /sbin/rpc.statd 1>&2
-    eend $? "Error stopping NFS statd"
-}
-
-start() {
-    if [ "$NFSSERVER" = "yes" ]
-    then
-	start_statd
-
-	if grep -q '^/' /etc/exports &>/dev/null; then
-	    ebegin "Exporting NFS directories"
-	    /sbin/exportfs -r 1>&2
-	    eend $? "Error exporting NFS directories"
-	fi
-
-	ebegin "Starting NFS rquotad"
-	start-stop-daemon --start --quiet --exec /sbin/rpc.rquotad 1>&2
-	eend $? "Error starting NFS rquotad"
-
-	ebegin "Starting NFS daemon"
-	start-stop-daemon --start --quiet --exec \
-	    /sbin/rpc.nfsd -- $RPCNFSDCOUNT 1>&2
-	eend $? "Error starting NFS daemon"
-
-	# Check if we support NFSv3
-	ebegin "Starting NFS mountd"
-	rpcinfo -u localhost nfs 3 &>/dev/null || \
-	    RPCMOUNTDOPTS="$RPCMOUNTDOPTS --no-nfs-version 3"
-	start-stop-daemon --start --quiet --exec \
-	    /sbin/rpc.mountd -- $RPCMOUNTDOPTS 1>&2
-	eend $? "Error starting NFS mountd"
-    fi
-}
-
-stop() { 
-    # Don't check NFSSERVER variable since it might have changed,
-    # instead use --oknodo to smooth things over
-    ebegin "Stopping NFS mountd"
-    start-stop-daemon --stop --quiet --oknodo \
-	--exec /sbin/rpc.mountd 1>&2
-    eend $? "Error stopping NFS mountd"
-
-    ebegin "Stopping NFS daemon"
-    start-stop-daemon --stop --quiet --oknodo \
-	--name nfsd --user root --signal 2 1>&2
-    eend $? "Error stopping NFS daemon"
-
-    ebegin "Stopping NFS rquotad"
-    start-stop-daemon --stop --quiet --oknodo \
-	--exec /sbin/rpc.rquotad 1>&2
-    eend $? "Error stopping NFS rquotad"
-
-    # When simply 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.
-    #
-    # This is 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 ]; then
-	ebegin "Unexporting NFS directories"
-	/sbin/exportfs -ua 1>&2
-	eend $? "Error unexporting NFS directories"
-    fi
-
-    stop_statd
-}
-
-reload() {
-    /sbin/exportfs -r
-}
-
-restart() {
-    # See comment in stop() regarding exportfs -ua
-    RESTARTING=yes
-    stop
-    start
-}
-
-doservice "${@}"
diff --git a/net-fs/nfs-utils/files/nfs-0.3.1-r6 b/net-fs/nfs-utils/files/nfs-0.3.1-r6
deleted file mode 100644
index 028a6676ed89..000000000000
--- a/net-fs/nfs-utils/files/nfs-0.3.1-r6
+++ /dev/null
@@ -1,128 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfs-0.3.1-r6,v 1.2 2001/12/06 20:17:02 azarah Exp $
-
-#---------------------------------------------------------------------------
-# This script starts/stops the following
-#    rpc.statd if necessary (also checked by init.d/nfsmount)
-#    rpd.rquotad
-#    rpd.nfsd
-#    rpc.mountd
-#
-# (17 Aug 2001 agriffis)
-#---------------------------------------------------------------------------
-
-# These can be overridden in /etc/rc.d/config/basic if desired
-RPCNFSDCOUNT=8  # Number of servers to be started up by default
-RPCMOUNTDOPTS=
-
-# This variable is used for controlling whether or not to run exportfs -ua;
-# see stop() for more information
-RESTARTING=no
-
-opts="start stop restart reload"
-
-depend() {
-    need net portmap
-}
-
-start_statd() {
-    # Don't start rpc.statd if already started by init.d/nfsmount
-    killall -0 rpc.statd &>/dev/null && return 0
-    ebegin "Starting NFS statd"
-    start-stop-daemon --start --quiet --exec /sbin/rpc.statd 1>&2
-    eend $? "Error starting NFS statd"
-}
-
-stop_statd() {
-    # Don't stop rpc.statd if it's in use by init.d/nfsmount.
-    mount -t nfs | grep -q . && return 0
-    # Make sure it's actually running
-    killall -0 rpc.statd &>/dev/null || return 0
-    # Okay, all tests passed, stop rpc.statd
-    ebegin "Stopping NFS statd"
-    start-stop-daemon --stop --quiet --exec /sbin/rpc.statd 1>&2
-    eend $? "Error stopping NFS statd"
-}
-
-start() {
-    if [ "$NFSSERVER" = "yes" ]
-    then
-	start_statd
-
-	if grep -q '^/' /etc/exports &>/dev/null; then
-	    ebegin "Exporting NFS directories"
-	    /sbin/exportfs -r 1>&2
-	    eend $? "Error exporting NFS directories"
-	fi
-
-	ebegin "Starting NFS rquotad"
-	start-stop-daemon --start --quiet --exec /sbin/rpc.rquotad 1>&2
-	eend $? "Error starting NFS rquotad"
-
-	ebegin "Starting NFS daemon"
-	start-stop-daemon --start --quiet --exec \
-	    /sbin/rpc.nfsd -- $RPCNFSDCOUNT 1>&2
-	eend $? "Error starting NFS daemon"
-
-	# Check if we support NFSv3
-	ebegin "Starting NFS mountd"
-	rpcinfo -u localhost nfs 3 &>/dev/null || \
-	    RPCMOUNTDOPTS="$RPCMOUNTDOPTS --no-nfs-version 3"
-	start-stop-daemon --start --quiet --exec \
-	    /sbin/rpc.mountd -- $RPCMOUNTDOPTS 1>&2
-	eend $? "Error starting NFS mountd"
-    fi
-}
-
-stop() { 
-    # Don't check NFSSERVER variable since it might have changed,
-    # instead use --oknodo to smooth things over
-    ebegin "Stopping NFS mountd"
-    start-stop-daemon --stop --quiet --oknodo \
-	--exec /sbin/rpc.mountd 1>&2
-    eend $? "Error stopping NFS mountd"
-
-    ebegin "Stopping NFS daemon"
-    start-stop-daemon --stop --quiet --oknodo \
-	--name nfsd --user root --signal 2 1>&2
-    eend $? "Error stopping NFS daemon"
-
-    ebegin "Stopping NFS rquotad"
-    start-stop-daemon --stop --quiet --oknodo \
-	--exec /sbin/rpc.rquotad 1>&2
-    eend $? "Error stopping NFS rquotad"
-
-    # When simply 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.
-    #
-    # This is 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 ]; then
-	ebegin "Unexporting NFS directories"
-	/sbin/exportfs -ua 1>&2
-	eend $? "Error unexporting NFS directories"
-    fi
-
-    stop_statd
-}
-
-reload() {
-    /sbin/exportfs -r
-}
-
-restart() {
-    # See comment in stop() regarding exportfs -ua
-    RESTARTING=yes
-    stop
-    start
-}
diff --git a/net-fs/nfs-utils/files/nfs-0.3.1-r7 b/net-fs/nfs-utils/files/nfs-0.3.1-r7
deleted file mode 100644
index a9cd053c69f3..000000000000
--- a/net-fs/nfs-utils/files/nfs-0.3.1-r7
+++ /dev/null
@@ -1,122 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfs-0.3.1-r7,v 1.2 2001/12/06 20:17:02 azarah Exp $
-
-#---------------------------------------------------------------------------
-# This script starts/stops the following
-#    rpc.statd if necessary (also checked by init.d/nfsmount)
-#    rpd.rquotad
-#    rpd.nfsd
-#    rpc.mountd
-#---------------------------------------------------------------------------
-
-opts="start stop restart reload"
-
-# This variable is used for controlling whether or not to run exportfs -ua;
-# see stop() for more information
-RESTARTING=no
-
-depend() {
-	need net portmap
-}
-
-start_statd() {
-	# Don't start rpc.statd if already started by init.d/nfsmount
-	killall -0 rpc.statd &>/dev/null && return 0
-	ebegin "Starting NFS statd"
-	start-stop-daemon --start --quiet --exec /sbin/rpc.statd 1>&2
-	eend $? "Error starting NFS statd"
-}
-
-stop_statd() {
-	# Don't stop rpc.statd if it's in use by init.d/nfsmount.
-	mount -t nfs | grep -q . && return 0
-	# Make sure it's actually running
-	killall -0 rpc.statd &>/dev/null || return 0
-	# Okay, all tests passed, stop rpc.statd
-	ebegin "Stopping NFS statd"
-	start-stop-daemon --stop --quiet --exec /sbin/rpc.statd 1>&2
-	eend $? "Error stopping NFS statd"
-}
-
-start() {
-	if [ "$NFSSERVER" = "yes" ]
-	then
-		start_statd
-
-		if grep -q '^/' /etc/exports &>/dev/null; then
-			ebegin "Exporting NFS directories"
-			/sbin/exportfs -r 1>&2
-			eend $? "Error exporting NFS directories"
-		fi
-
-		ebegin "Starting NFS rquotad"
-		start-stop-daemon --start --quiet --exec /sbin/rpc.rquotad 1>&2
-		eend $? "Error starting NFS rquotad"
-
-		ebegin "Starting NFS daemon"
-		start-stop-daemon --start --quiet --exec \
-			/sbin/rpc.nfsd -- $RPCNFSDCOUNT 1>&2
-		eend $? "Error starting NFS daemon"
-
-		# Check if we support NFSv3
-		ebegin "Starting NFS mountd"
-		rpcinfo -u localhost nfs 3 &>/dev/null || \
-			RPCMOUNTDOPTS="$RPCMOUNTDOPTS --no-nfs-version 3"
-		start-stop-daemon --start --quiet --exec \
-			/sbin/rpc.mountd -- $RPCMOUNTDOPTS 1>&2
-		eend $? "Error starting NFS mountd"
-	fi
-}
-
-stop() { 
-	# Don't check NFSSERVER variable since it might have changed,
-	# instead use --oknodo to smooth things over
-	ebegin "Stopping NFS mountd"
-	start-stop-daemon --stop --quiet --oknodo \
-		--exec /sbin/rpc.mountd 1>&2
-	eend $? "Error stopping NFS mountd"
-
-	ebegin "Stopping NFS daemon"
-	start-stop-daemon --stop --quiet --oknodo \
-		--name nfsd --user root --signal 2 1>&2
-	eend $? "Error stopping NFS daemon"
-
-	ebegin "Stopping NFS rquotad"
-	start-stop-daemon --stop --quiet --oknodo \
-		--exec /sbin/rpc.rquotad 1>&2
-	eend $? "Error stopping NFS rquotad"
-
-	# 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 ]; then
-		ebegin "Unexporting NFS directories"
-		/sbin/exportfs -ua 1>&2
-		eend $? "Error unexporting NFS directories"
-	fi
-
-	stop_statd
-}
-
-reload() {
-	/sbin/exportfs -r
-}
-
-restart() {
-	# See long comment in stop() regarding RESTARTING and exportfs -ua
-	RESTARTING=yes
-	stop
-	start
-}
diff --git a/net-fs/nfs-utils/files/nfs-utils-0.2.1-r3-gentoo.diff b/net-fs/nfs-utils/files/nfs-utils-0.2.1-r3-gentoo.diff
deleted file mode 100644
index 2265f309bb14..000000000000
--- a/net-fs/nfs-utils/files/nfs-utils-0.2.1-r3-gentoo.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- nfs-utils-0.2.1/support/nfs/rpcmisc.c~	Sun Apr 30 06:14:56 2000
-+++ nfs-utils-0.2.1/support/nfs/rpcmisc.c	Mon Apr 23 17:20:51 2001
-@@ -13,7 +13,7 @@
-  */
- 
- #include "config.h"
--
-+#include <time.h>
- #include <sys/types.h>
- #include <sys/ioctl.h>
- #include <sys/stat.h>
diff --git a/net-fs/nfs-utils/files/nfs-utils-0.3.1-r1-gentoo.diff b/net-fs/nfs-utils/files/nfs-utils-0.3.1-r1-gentoo.diff
deleted file mode 100644
index 2265f309bb14..000000000000
--- a/net-fs/nfs-utils/files/nfs-utils-0.3.1-r1-gentoo.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- nfs-utils-0.2.1/support/nfs/rpcmisc.c~	Sun Apr 30 06:14:56 2000
-+++ nfs-utils-0.2.1/support/nfs/rpcmisc.c	Mon Apr 23 17:20:51 2001
-@@ -13,7 +13,7 @@
-  */
- 
- #include "config.h"
--
-+#include <time.h>
- #include <sys/types.h>
- #include <sys/ioctl.h>
- #include <sys/stat.h>
diff --git a/net-fs/nfs-utils/files/nfs-utils-0.3.1-r6-gentoo.diff b/net-fs/nfs-utils/files/nfs-utils-0.3.1-r6-gentoo.diff
deleted file mode 100644
index 2265f309bb14..000000000000
--- a/net-fs/nfs-utils/files/nfs-utils-0.3.1-r6-gentoo.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- nfs-utils-0.2.1/support/nfs/rpcmisc.c~	Sun Apr 30 06:14:56 2000
-+++ nfs-utils-0.2.1/support/nfs/rpcmisc.c	Mon Apr 23 17:20:51 2001
-@@ -13,7 +13,7 @@
-  */
- 
- #include "config.h"
--
-+#include <time.h>
- #include <sys/types.h>
- #include <sys/ioctl.h>
- #include <sys/stat.h>
diff --git a/net-fs/nfs-utils/files/nfs-utils-0.3.1-r7-gentoo.diff b/net-fs/nfs-utils/files/nfs-utils-0.3.1-r7-gentoo.diff
deleted file mode 100644
index 2265f309bb14..000000000000
--- a/net-fs/nfs-utils/files/nfs-utils-0.3.1-r7-gentoo.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- nfs-utils-0.2.1/support/nfs/rpcmisc.c~	Sun Apr 30 06:14:56 2000
-+++ nfs-utils-0.2.1/support/nfs/rpcmisc.c	Mon Apr 23 17:20:51 2001
-@@ -13,7 +13,7 @@
-  */
- 
- #include "config.h"
--
-+#include <time.h>
- #include <sys/types.h>
- #include <sys/ioctl.h>
- #include <sys/stat.h>
diff --git a/net-fs/nfs-utils/files/nfs.confd b/net-fs/nfs-utils/files/nfs.confd
index b759218b1277..b44145fa27cb 100644
--- a/net-fs/nfs-utils/files/nfs.confd
+++ b/net-fs/nfs-utils/files/nfs.confd
@@ -1,13 +1,5 @@
 # Config file for /etc/init.d/nfs
 
-# This is a safety net to keep from running an NFS server unless the
-# administrator really wants it.  It's mostly historical because early
-# versions of Gentoo didn't split nfs/nfsmount into two scripts.
-# These days it might be safe to remove this eventually, since
-# administrators specifically have to run "rc-update add nfs default"
-# in order for the NFS server to run.
-NFSSERVER=no
-
 # Number of servers to be started up by default
 RPCNFSDCOUNT=8
 
diff --git a/net-fs/nfs-utils/files/nfs.confd-0.3.1-r7 b/net-fs/nfs-utils/files/nfs.confd-0.3.1-r7
deleted file mode 100644
index a3b27aa2a7a1..000000000000
--- a/net-fs/nfs-utils/files/nfs.confd-0.3.1-r7
+++ /dev/null
@@ -1,13 +0,0 @@
-# This is a safety net to keep from running an NFS server unless the
-# administrator really wants it.  It's mostly historical because early
-# versions of Gentoo didn't split nfs/nfsmount into two scripts.
-# These days it might be safe to remove this eventually, since
-# administrators specifically have to run "rc-update add nfs default"
-# in order for the NFS server to run.
-NFSSERVER=no
-
-# Number of servers to be started up by default
-RPCNFSDCOUNT=8
-
-# Options to pass to rpc.mountd
-RPCMOUNTDOPTS=""
diff --git a/net-fs/nfs-utils/files/nfs.rc6 b/net-fs/nfs-utils/files/nfs.rc6
deleted file mode 100644
index ce4d85379fec..000000000000
--- a/net-fs/nfs-utils/files/nfs.rc6
+++ /dev/null
@@ -1,142 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfs.rc6,v 1.2 2002/01/13 22:29:12 agriffis Exp $
-
-#---------------------------------------------------------------------------
-# This script starts/stops the following
-#	 rpc.statd if necessary (also checked by init.d/nfsmount)
-#	 rpd.rquotad
-#	 rpd.nfsd
-#	 rpc.mountd
-#---------------------------------------------------------------------------
-
-# NB: Config is in /etc/conf.d/nfs
-
-
-opts="start stop restart reload"
-
-# This variable is used for controlling whether or not to run exportfs -ua;
-# see stop() for more information
-RESTARTING=no
-
-depend() {
-	need net portmap
-}
-
-start_statd() {
-	# Don't start rpc.statd if already started by init.d/nfsmount
-	killall -0 rpc.statd &>/dev/null && return 0
-	ebegin "Starting NFS statd"
-	start-stop-daemon --start --quiet --exec /sbin/rpc.statd 1>&2
-	eend $? "Error starting NFS statd"
-}
-
-stop_statd() {
-	# Don't stop rpc.statd if it's in use by init.d/nfsmount.
-	mount -t nfs | grep -q . && return 0
-	# Make sure it's actually running
-	killall -0 rpc.statd &>/dev/null || return 0
-	# Okay, all tests passed, stop rpc.statd
-	ebegin "Stopping NFS statd"
-	start-stop-daemon --stop --quiet --exec /sbin/rpc.statd 1>&2
-	eend $? "Error stopping NFS statd"
-}
-
-start() {
-	if [ "$NFSSERVER" = "yes" ]
-	then
-		start_statd
-
-		# 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 -q '^/' /etc/exports &>/dev/null; then
-			ebegin "Exporting NFS directories"
-			/sbin/exportfs -r 1>&2 &
-			( sleep 5; kill -9 $! &>/dev/null & )
-			wait
-			eend $? "Error exporting NFS directories"
-		fi
-
-		ebegin "Starting NFS rquotad"
-		start-stop-daemon --start --quiet --exec /sbin/rpc.rquotad 1>&2
-		eend $? "Error starting NFS rquotad"
-
-		ebegin "Starting NFS daemon"
-		start-stop-daemon --start --quiet --exec \
-			/sbin/rpc.nfsd -- $RPCNFSDCOUNT 1>&2
-		eend $? "Error starting NFS daemon"
-
-		# Check if we support NFSv3
-		ebegin "Starting NFS mountd"
-		rpcinfo -u localhost nfs 3 &>/dev/null || \
-			RPCMOUNTDOPTS="$RPCMOUNTDOPTS --no-nfs-version 3"
-		start-stop-daemon --start --quiet --exec \
-			/sbin/rpc.mountd -- $RPCMOUNTDOPTS 1>&2
-		eend $? "Error starting NFS mountd"
-	fi
-}
-
-stop() { 
-	# Don't check NFSSERVER variable since it might have changed,
-	# instead use --oknodo to smooth things over
-	ebegin "Stopping NFS mountd"
-	start-stop-daemon --stop --quiet --oknodo \
-		--exec /sbin/rpc.mountd 1>&2
-	eend $? "Error stopping NFS mountd"
-
-	ebegin "Stopping NFS daemon"
-	start-stop-daemon --stop --quiet --oknodo \
-		--name nfsd --user root --signal 2 1>&2
-	eend $? "Error stopping NFS daemon"
-
-	ebegin "Stopping NFS rquotad"
-	start-stop-daemon --stop --quiet --oknodo \
-		--exec /sbin/rpc.rquotad 1>&2
-	eend $? "Error stopping NFS rquotad"
-
-	# 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 ]; 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
-		# bootup process can continue.
-		/sbin/exportfs -ua 1>&2 &
-		( sleep 5; kill -9 $! &>/dev/null & )
-		wait
-		eend $? "Error unexporting NFS directories"
-	fi
-
-	stop_statd
-}
-
-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"
-	/sbin/exportfs -r 1>&2 &
-	( sleep 5; kill -9 $! &>/dev/null & )
-	wait
-	eend $? "Error exporting NFS directories"
-}
-
-restart() {
-	# See long comment in stop() regarding RESTARTING and exportfs -ua
-	RESTARTING=yes
-	stop
-	start
-}
diff --git a/net-fs/nfs-utils/files/nfsmount.rc6 b/net-fs/nfs-utils/files/nfsmount
index 83ea67edf258..999322538f78 100644
--- a/net-fs/nfs-utils/files/nfsmount.rc6
+++ b/net-fs/nfs-utils/files/nfsmount
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfsmount.rc6,v 1.2 2002/01/13 22:29:12 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfsmount,v 1.1 2002/04/24 22:18:12 drobbins Exp $
 
 depend() {
 	need net portmap
diff --git a/net-fs/nfs-utils/files/nfsmount-0.3.1-r1 b/net-fs/nfs-utils/files/nfsmount-0.3.1-r1
deleted file mode 100644
index 5e552ee6020a..000000000000
--- a/net-fs/nfs-utils/files/nfsmount-0.3.1-r1
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/sh
-#RCUPDATE:3 4:74:This line is required for script management
-
-. /etc/rc.d/config/functions
-. /etc/rc.d/config/basic
-
-opts="start stop restart"
-
-start_statd() {
-    # Don't start rpc.statd if already started by init.d/nfs
-    killall -0 rpc.statd &>/dev/null && return 0
-    ebegin "Starting NFS statd"
-    start-stop-daemon --start --quiet --exec /sbin/rpc.statd 1>&2
-    eend $? "Error starting NFS statd"
-}
-
-stop_statd() {
-    # Don't stop rpc.statd if it's in use by init.d/nfs
-    killall -0 nfsd &>/dev/null && return 0
-    # Make sure it's actually running
-    killall -0 rpc.statd &>/dev/null || return 0
-    # Okay, all tests passed, stop rpc.statd
-    ebegin "Stopping NFS statd"
-    start-stop-daemon --stop --quiet --exec /sbin/rpc.statd 1>&2
-    eend $? "Error stopping NFS statd"
-}
-
-start() {
-    start_statd
-    ebegin "Mounting NFS filesystems"
-    mount -a -t nfs
-    eend $? "Error mounting NFS filesystems"
-}
-
-stop() {
-    ebegin "Unmounting NFS filesystems"
-    umount -a -t nfs
-    eend $? "Error unmounting NFS filesystems"
-    stop_statd
-}
-
-restart() {
-    stop
-    start
-}
-
-doservice "${@}"
diff --git a/net-fs/nfs-utils/files/nfsmount-0.3.1-r6 b/net-fs/nfs-utils/files/nfsmount-0.3.1-r6
deleted file mode 100644
index c2bc51c1ce21..000000000000
--- a/net-fs/nfs-utils/files/nfsmount-0.3.1-r6
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfsmount-0.3.1-r6,v 1.2 2001/12/06 20:17:02 azarah Exp $
-
-opts="start stop restart"
-
-depend() {
-    need net portmap
-}
-
-start_statd() {
-    # Don't start rpc.statd if already started by init.d/nfs
-    killall -0 rpc.statd &>/dev/null && return 0
-    ebegin "Starting NFS statd"
-    start-stop-daemon --start --quiet --exec /sbin/rpc.statd 1>&2
-    eend $? "Error starting NFS statd"
-}
-
-stop_statd() {
-    # Don't stop rpc.statd if it's in use by init.d/nfs
-    killall -0 nfsd &>/dev/null && return 0
-    # Make sure it's actually running
-    killall -0 rpc.statd &>/dev/null || return 0
-    # Okay, all tests passed, stop rpc.statd
-    ebegin "Stopping NFS statd"
-    start-stop-daemon --stop --quiet --exec /sbin/rpc.statd 1>&2
-    eend $? "Error stopping NFS statd"
-}
-
-start() {
-    start_statd
-    ebegin "Mounting NFS filesystems"
-    mount -a -t nfs
-    eend $? "Error mounting NFS filesystems"
-}
-
-stop() {
-    ebegin "Unmounting NFS filesystems"
-    umount -a -t nfs
-    eend $? "Error unmounting NFS filesystems"
-    stop_statd
-}
-
-restart() {
-    stop
-    start
-}
diff --git a/net-fs/nfs-utils/files/nfsmount-0.3.1-r7 b/net-fs/nfs-utils/files/nfsmount-0.3.1-r7
deleted file mode 100644
index a2671d17ee77..000000000000
--- a/net-fs/nfs-utils/files/nfsmount-0.3.1-r7
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfsmount-0.3.1-r7,v 1.2 2001/12/06 20:17:02 azarah Exp $
-
-depend() {
-	need net portmap
-}
-
-start_statd() {
-	# Don't start rpc.statd if already started by init.d/nfs
-	killall -0 rpc.statd &>/dev/null && return 0
-	ebegin "Starting NFS statd"
-	start-stop-daemon --start --quiet --exec /sbin/rpc.statd 1>&2
-	eend $? "Error starting NFS statd"
-}
-
-stop_statd() {
-	# Don't stop rpc.statd if it's in use by init.d/nfs
-	killall -0 nfsd &>/dev/null && return 0
-	# Make sure it's actually running
-	killall -0 rpc.statd &>/dev/null || return 0
-	# Okay, all tests passed, stop rpc.statd
-	ebegin "Stopping NFS statd"
-	start-stop-daemon --stop --quiet --exec /sbin/rpc.statd 1>&2
-	eend $? "Error stopping NFS statd"
-}
-
-start() {
-	start_statd
-	ebegin "Mounting NFS filesystems"
-	mount -a -t nfs
-	eend $? "Error mounting NFS filesystems"
-}
-
-stop() {
-	ebegin "Unmounting NFS filesystems"
-	umount -a -t nfs
-	eend $? "Error unmounting NFS filesystems"
-	stop_statd
-}
-
-restart() {
-	stop
-	start
-}