svn commit: r223852 - in head: . etc/rc.d

[Rick Macklem]

Author: rmacklem
Date: Fri Jul  8 00:49:50 2011
New Revision: 223852
URL: http://svn.freebsd.org/changeset/base/223852

Log:
  Delete the /etc/rc.d/nfsserver script, since it is no
  longer used by /etc/rc.d/nfsd and it is no longer necessary
  to load the old nfs server by default, when nfs_server_enable="YES".
  
  Tested by:	sgk at troutmask.apl.washington.edu
  Reviewed by:	rc (Andrzej Tobola)

Deleted:
  head/etc/rc.d/nfsserver
Modified:
  head/ObsoleteFiles.inc
  head/etc/rc.d/Makefile
  head/etc/rc.d/lockd
  head/etc/rc.d/mountd
  head/etc/rc.d/statd

Modified: head/ObsoleteFiles.inc
==============================================================================
--- head/ObsoleteFiles.inc	Thu Jul  7 23:32:44 2011	(r223851)
+++ head/ObsoleteFiles.inc	Fri Jul  8 00:49:50 2011	(r223852)
@@ -38,6 +38,8 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20110707: script no longer needed by /etc/rc.d/nfsd
+OLD_FILES+=etc/rc.d/nfsserver
 # 20110705: files moved so both NFS clients can share them
 OLD_FILES+=usr/include/nfsclient/krpc.h
 OLD_FILES+=usr/include/nfsclient/nfsdiskless.h

Modified: head/etc/rc.d/Makefile
==============================================================================
--- head/etc/rc.d/Makefile	Thu Jul  7 23:32:44 2011	(r223851)
+++ head/etc/rc.d/Makefile	Fri Jul  8 00:49:50 2011	(r223852)
@@ -24,7 +24,7 @@ FILES=	DAEMON FILESYSTEMS LOGIN NETWORKI
 	mdconfig mdconfig2 mountd moused mroute6d mrouted msgs \
 	named natd netif netoptions netwait \
 	newsyslog nfsclient nfscbd nfsd \
-	nfsserver nfsuserd nisdomain nsswitch ntpd ntpdate \
+	nfsuserd nisdomain nsswitch ntpd ntpdate \
 	othermta \
 	pf pflog pfsync \
 	powerd power_profile ppp pppoed pwcheck \

Modified: head/etc/rc.d/lockd
==============================================================================
--- head/etc/rc.d/lockd	Thu Jul  7 23:32:44 2011	(r223851)
+++ head/etc/rc.d/lockd	Fri Jul  8 00:49:50 2011	(r223852)
@@ -5,7 +5,7 @@
 #
 
 # PROVIDE: lockd
-# REQUIRE: nfsserver nfsclient nfsd rpcbind statd
+# REQUIRE: nfsclient nfsd rpcbind statd
 # BEFORE:  DAEMON
 # KEYWORD: nojail shutdown
 

Modified: head/etc/rc.d/mountd
==============================================================================
--- head/etc/rc.d/mountd	Thu Jul  7 23:32:44 2011	(r223851)
+++ head/etc/rc.d/mountd	Fri Jul  8 00:49:50 2011	(r223852)
@@ -4,7 +4,7 @@
 #
 
 # PROVIDE: mountd
-# REQUIRE: NETWORKING nfsserver rpcbind quota
+# REQUIRE: NETWORKING rpcbind quota
 # KEYWORD: nojail shutdown
 
 . /etc/rc.subr

Modified: head/etc/rc.d/statd
==============================================================================
--- head/etc/rc.d/statd	Thu Jul  7 23:32:44 2011	(r223851)
+++ head/etc/rc.d/statd	Fri Jul  8 00:49:50 2011	(r223852)
@@ -5,7 +5,7 @@
 #
 
 # PROVIDE: statd
-# REQUIRE: nfsserver nfsclient nfsd rpcbind
+# REQUIRE: nfsclient nfsd rpcbind
 # BEFORE:  DAEMON
 # KEYWORD: nojail shutdown