From owner-svn-src-all@FreeBSD.ORG Fri Jul 8 00:49:51 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 81569106566C; Fri, 8 Jul 2011 00:49:51 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 577C08FC12; Fri, 8 Jul 2011 00:49:51 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p680npsw085660; Fri, 8 Jul 2011 00:49:51 GMT (envelope-from rmacklem@svn.freebsd.org) Received: (from rmacklem@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p680npZX085654; Fri, 8 Jul 2011 00:49:51 GMT (envelope-from rmacklem@svn.freebsd.org) Message-Id: <201107080049.p680npZX085654@svn.freebsd.org> From: Rick Macklem Date: Fri, 8 Jul 2011 00:49:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r223852 - in head: . etc/rc.d X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Jul 2011 00:49:51 -0000 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