From owner-svn-src-stable@FreeBSD.ORG  Tue Mar 24 02:48:56 2009
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B00161065674;
	Tue, 24 Mar 2009 02:48:56 +0000 (UTC)
	(envelope-from dougb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 9BF878FC1A;
	Tue, 24 Mar 2009 02:48:56 +0000 (UTC)
	(envelope-from dougb@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n2O2muKg030284;
	Tue, 24 Mar 2009 02:48:56 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n2O2mt6p030250;
	Tue, 24 Mar 2009 02:48:55 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <200903240248.n2O2mt6p030250@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Tue, 24 Mar 2009 02:48:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r190362 - in stable/7/etc: . rc.d
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 24 Mar 2009 02:48:57 -0000

Author: dougb
Date: Tue Mar 24 02:48:54 2009
New Revision: 190362
URL: http://svn.freebsd.org/changeset/base/190362

Log:
  MFC r180564, addition of the SHUTDOWN keyword to those scripts that
  start persistent services.

Modified:
  stable/7/etc/   (props changed)
  stable/7/etc/rc.d/amd
  stable/7/etc/rc.d/apmd
  stable/7/etc/rc.d/bsnmpd
  stable/7/etc/rc.d/bthidd
  stable/7/etc/rc.d/devd
  stable/7/etc/rc.d/ftp-proxy
  stable/7/etc/rc.d/ftpd
  stable/7/etc/rc.d/hcsecd
  stable/7/etc/rc.d/idmapd
  stable/7/etc/rc.d/keyserv
  stable/7/etc/rc.d/lockd
  stable/7/etc/rc.d/lpd
  stable/7/etc/rc.d/mountd
  stable/7/etc/rc.d/moused
  stable/7/etc/rc.d/nfsd
  stable/7/etc/rc.d/nscd
  stable/7/etc/rc.d/ntpd
  stable/7/etc/rc.d/powerd
  stable/7/etc/rc.d/rpcbind
  stable/7/etc/rc.d/rtadvd
  stable/7/etc/rc.d/rwho
  stable/7/etc/rc.d/sdpd
  stable/7/etc/rc.d/sendmail
  stable/7/etc/rc.d/sshd
  stable/7/etc/rc.d/statd
  stable/7/etc/rc.d/timed
  stable/7/etc/rc.d/ugidfw
  stable/7/etc/rc.d/watchdogd
  stable/7/etc/rc.d/ypbind
  stable/7/etc/rc.d/yppasswdd
  stable/7/etc/rc.d/ypserv
  stable/7/etc/rc.d/ypset
  stable/7/etc/rc.d/ypupdated
  stable/7/etc/rc.d/ypxfrd

Modified: stable/7/etc/rc.d/amd
==============================================================================
--- stable/7/etc/rc.d/amd	Tue Mar 24 02:28:46 2009	(r190361)
+++ stable/7/etc/rc.d/amd	Tue Mar 24 02:48:54 2009	(r190362)
@@ -6,7 +6,7 @@
 # PROVIDE: amd
 # REQUIRE: rpcbind ypbind nfsclient cleanvar ldconfig
 # BEFORE: DAEMON
-# KEYWORD: nojail
+# KEYWORD: nojail shutdown
 
 . /etc/rc.subr
 

Modified: stable/7/etc/rc.d/apmd
==============================================================================
--- stable/7/etc/rc.d/apmd	Tue Mar 24 02:28:46 2009	(r190361)
+++ stable/7/etc/rc.d/apmd	Tue Mar 24 02:48:54 2009	(r190362)
@@ -6,7 +6,7 @@
 # PROVIDE: apmd
 # REQUIRE: DAEMON apm
 # BEFORE:  LOGIN
-# KEYWORD: nojail
+# KEYWORD: nojail shutdown
 
 . /etc/rc.subr
 

Modified: stable/7/etc/rc.d/bsnmpd
==============================================================================
--- stable/7/etc/rc.d/bsnmpd	Tue Mar 24 02:28:46 2009	(r190361)
+++ stable/7/etc/rc.d/bsnmpd	Tue Mar 24 02:48:54 2009	(r190362)
@@ -5,7 +5,7 @@
 
 # PROVIDE: bsnmpd
 # REQUIRE: NETWORKING syslogd
-# KEYWORD: nojail
+# KEYWORD: nojail shutdown
 
 . /etc/rc.subr
 

Modified: stable/7/etc/rc.d/bthidd
==============================================================================
--- stable/7/etc/rc.d/bthidd	Tue Mar 24 02:28:46 2009	(r190361)
+++ stable/7/etc/rc.d/bthidd	Tue Mar 24 02:48:54 2009	(r190362)
@@ -6,7 +6,7 @@
 # PROVIDE: bthidd
 # REQUIRE: DAEMON hcsecd
 # BEFORE: LOGIN
-# KEYWORD: nojail
+# KEYWORD: nojail shutdown
 
 . /etc/rc.subr
 

Modified: stable/7/etc/rc.d/devd
==============================================================================
--- stable/7/etc/rc.d/devd	Tue Mar 24 02:28:46 2009	(r190361)
+++ stable/7/etc/rc.d/devd	Tue Mar 24 02:48:54 2009	(r190362)
@@ -6,7 +6,7 @@
 # PROVIDE: devd
 # REQUIRE: netif network_ipv6
 # BEFORE: NETWORKING mountcritremote
-# KEYWORD: nojail
+# KEYWORD: nojail shutdown
 
 . /etc/rc.subr
 

Modified: stable/7/etc/rc.d/ftp-proxy
==============================================================================
--- stable/7/etc/rc.d/ftp-proxy	Tue Mar 24 02:28:46 2009	(r190361)
+++ stable/7/etc/rc.d/ftp-proxy	Tue Mar 24 02:48:54 2009	(r190362)
@@ -5,6 +5,7 @@
 
 # PROVIDE: ftp-proxy
 # REQUIRE: DAEMON pf
+# KEYWORD: shutdown
 
 . /etc/rc.subr
 

Modified: stable/7/etc/rc.d/ftpd
==============================================================================
--- stable/7/etc/rc.d/ftpd	Tue Mar 24 02:28:46 2009	(r190361)
+++ stable/7/etc/rc.d/ftpd	Tue Mar 24 02:48:54 2009	(r190362)
@@ -5,6 +5,7 @@
 
 # PROVIDE: ftpd
 # REQUIRE: LOGIN cleanvar
+# KEYWORD: shutdown
 
 . /etc/rc.subr
 

Modified: stable/7/etc/rc.d/hcsecd
==============================================================================
--- stable/7/etc/rc.d/hcsecd	Tue Mar 24 02:28:46 2009	(r190361)
+++ stable/7/etc/rc.d/hcsecd	Tue Mar 24 02:48:54 2009	(r190362)
@@ -6,7 +6,7 @@
 # PROVIDE: hcsecd
 # REQUIRE: DAEMON
 # BEFORE: LOGIN
-# KEYWORD: nojail
+# KEYWORD: nojail shutdown
 
 . /etc/rc.subr
 

Modified: stable/7/etc/rc.d/idmapd
==============================================================================
--- stable/7/etc/rc.d/idmapd	Tue Mar 24 02:28:46 2009	(r190361)
+++ stable/7/etc/rc.d/idmapd	Tue Mar 24 02:48:54 2009	(r190362)
@@ -5,7 +5,7 @@
 
 # PROVIDE: idmapd
 # REQUIRE: rpcbind
-# KEYWORD: nojail
+# KEYWORD: nojail shutdown
 
 . /etc/rc.subr
 

Modified: stable/7/etc/rc.d/keyserv
==============================================================================
--- stable/7/etc/rc.d/keyserv	Tue Mar 24 02:28:46 2009	(r190361)
+++ stable/7/etc/rc.d/keyserv	Tue Mar 24 02:48:54 2009	(r190362)
@@ -8,6 +8,7 @@
 # PROVIDE: keyserv
 # REQUIRE: ypbind
 # BEFORE: DAEMON
+# KEYWORD: shutdown
 
 . /etc/rc.subr
 

Modified: stable/7/etc/rc.d/lockd
==============================================================================
--- stable/7/etc/rc.d/lockd	Tue Mar 24 02:28:46 2009	(r190361)
+++ stable/7/etc/rc.d/lockd	Tue Mar 24 02:48:54 2009	(r190362)
@@ -7,7 +7,7 @@
 # PROVIDE: lockd
 # REQUIRE: nfsserver nfsclient nfsd rpcbind statd
 # BEFORE:  DAEMON
-# KEYWORD: nojail
+# KEYWORD: nojail shutdown
 
 . /etc/rc.subr
 

Modified: stable/7/etc/rc.d/lpd
==============================================================================
--- stable/7/etc/rc.d/lpd	Tue Mar 24 02:28:46 2009	(r190361)
+++ stable/7/etc/rc.d/lpd	Tue Mar 24 02:48:54 2009	(r190362)
@@ -6,6 +6,7 @@
 # PROVIDE: lpd
 # REQUIRE: DAEMON
 # BEFORE:  LOGIN
+# KEYWORD: shutdown
 
 . /etc/rc.subr
 

Modified: stable/7/etc/rc.d/mountd
==============================================================================
--- stable/7/etc/rc.d/mountd	Tue Mar 24 02:28:46 2009	(r190361)
+++ stable/7/etc/rc.d/mountd	Tue Mar 24 02:48:54 2009	(r190362)
@@ -5,7 +5,7 @@
 
 # PROVIDE: mountd
 # REQUIRE: NETWORKING nfsserver rpcbind quota
-# KEYWORD: nojail
+# KEYWORD: nojail shutdown
 
 . /etc/rc.subr
 

Modified: stable/7/etc/rc.d/moused
==============================================================================
--- stable/7/etc/rc.d/moused	Tue Mar 24 02:28:46 2009	(r190361)
+++ stable/7/etc/rc.d/moused	Tue Mar 24 02:48:54 2009	(r190362)
@@ -5,7 +5,7 @@
 
 # PROVIDE: moused
 # REQUIRE: DAEMON cleanvar
-# KEYWORD: nojail
+# KEYWORD: nojail shutdown
 
 . /etc/rc.subr
 

Modified: stable/7/etc/rc.d/nfsd
==============================================================================
--- stable/7/etc/rc.d/nfsd	Tue Mar 24 02:28:46 2009	(r190361)
+++ stable/7/etc/rc.d/nfsd	Tue Mar 24 02:48:54 2009	(r190362)
@@ -5,7 +5,7 @@
 
 # PROVIDE: nfsd
 # REQUIRE: mountd
-# KEYWORD: nojail
+# KEYWORD: nojail shutdown
 
 . /etc/rc.subr
 

Modified: stable/7/etc/rc.d/nscd
==============================================================================
--- stable/7/etc/rc.d/nscd	Tue Mar 24 02:28:46 2009	(r190361)
+++ stable/7/etc/rc.d/nscd	Tue Mar 24 02:48:54 2009	(r190362)
@@ -6,6 +6,7 @@
 # PROVIDE: nscd
 # REQUIRE: DAEMON
 # BEFORE: LOGIN
+# KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable nscd:

Modified: stable/7/etc/rc.d/ntpd
==============================================================================
--- stable/7/etc/rc.d/ntpd	Tue Mar 24 02:28:46 2009	(r190361)
+++ stable/7/etc/rc.d/ntpd	Tue Mar 24 02:48:54 2009	(r190362)
@@ -6,7 +6,7 @@
 # PROVIDE: ntpd
 # REQUIRE: DAEMON ntpdate cleanvar devfs
 # BEFORE:  LOGIN
-# KEYWORD: nojail
+# KEYWORD: nojail shutdown
 
 . /etc/rc.subr
 

Modified: stable/7/etc/rc.d/powerd
==============================================================================
--- stable/7/etc/rc.d/powerd	Tue Mar 24 02:28:46 2009	(r190361)
+++ stable/7/etc/rc.d/powerd	Tue Mar 24 02:48:54 2009	(r190362)
@@ -6,7 +6,7 @@
 # PROVIDE: powerd
 # REQUIRE: DAEMON
 # BEFORE: LOGIN
-# KEYWORD: nojail
+# KEYWORD: nojail shutdown
 
 . /etc/rc.subr
 

Modified: stable/7/etc/rc.d/rpcbind
==============================================================================
--- stable/7/etc/rc.d/rpcbind	Tue Mar 24 02:28:46 2009	(r190361)
+++ stable/7/etc/rc.d/rpcbind	Tue Mar 24 02:48:54 2009	(r190362)
@@ -5,6 +5,7 @@
 
 # PROVIDE: rpcbind
 # REQUIRE: NETWORKING ntpdate syslogd named
+# KEYWORD: shutdown
 
 . /etc/rc.subr
 

Modified: stable/7/etc/rc.d/rtadvd
==============================================================================
--- stable/7/etc/rc.d/rtadvd	Tue Mar 24 02:28:46 2009	(r190361)
+++ stable/7/etc/rc.d/rtadvd	Tue Mar 24 02:48:54 2009	(r190362)
@@ -6,7 +6,7 @@
 # PROVIDE: rtadvd
 # REQUIRE: DAEMON
 # BEFORE:  LOGIN
-# KEYWORD: nojail
+# KEYWORD: nojail shutdown
 
 . /etc/rc.subr
 

Modified: stable/7/etc/rc.d/rwho
==============================================================================
--- stable/7/etc/rc.d/rwho	Tue Mar 24 02:28:46 2009	(r190361)
+++ stable/7/etc/rc.d/rwho	Tue Mar 24 02:48:54 2009	(r190362)
@@ -6,6 +6,7 @@
 # PROVIDE: rwho
 # REQUIRE: DAEMON
 # BEFORE:  LOGIN
+# KEYWORD: shutdown
 
 . /etc/rc.subr
 

Modified: stable/7/etc/rc.d/sdpd
==============================================================================
--- stable/7/etc/rc.d/sdpd	Tue Mar 24 02:28:46 2009	(r190361)
+++ stable/7/etc/rc.d/sdpd	Tue Mar 24 02:48:54 2009	(r190362)
@@ -6,7 +6,7 @@
 # PROVIDE: sdpd
 # REQUIRE: DAEMON
 # BEFORE: LOGIN
-# KEYWORD: nojail
+# KEYWORD: nojail shutdown
 
 . /etc/rc.subr
 

Modified: stable/7/etc/rc.d/sendmail
==============================================================================
--- stable/7/etc/rc.d/sendmail	Tue Mar 24 02:28:46 2009	(r190361)
+++ stable/7/etc/rc.d/sendmail	Tue Mar 24 02:48:54 2009	(r190362)
@@ -7,6 +7,7 @@
 # REQUIRE: LOGIN cleanvar
 #	we make mail start late, so that things like .forward's are not
 #	processed until the system is fully operational
+# KEYWORD: shutdown
 
 # XXX - Get together with sendmail mantainer to figure out how to
 #	better handle SENDMAIL_ENABLE and 3rd party MTAs.

Modified: stable/7/etc/rc.d/sshd
==============================================================================
--- stable/7/etc/rc.d/sshd	Tue Mar 24 02:28:46 2009	(r190361)
+++ stable/7/etc/rc.d/sshd	Tue Mar 24 02:48:54 2009	(r190362)
@@ -5,6 +5,7 @@
 
 # PROVIDE: sshd
 # REQUIRE: LOGIN cleanvar
+# KEYWORD: shutdown
 
 . /etc/rc.subr
 

Modified: stable/7/etc/rc.d/statd
==============================================================================
--- stable/7/etc/rc.d/statd	Tue Mar 24 02:28:46 2009	(r190361)
+++ stable/7/etc/rc.d/statd	Tue Mar 24 02:48:54 2009	(r190362)
@@ -7,7 +7,7 @@
 # PROVIDE: statd
 # REQUIRE: nfsserver nfsclient nfsd rpcbind
 # BEFORE:  DAEMON
-# KEYWORD: nojail
+# KEYWORD: nojail shutdown
 
 . /etc/rc.subr
 

Modified: stable/7/etc/rc.d/timed
==============================================================================
--- stable/7/etc/rc.d/timed	Tue Mar 24 02:28:46 2009	(r190361)
+++ stable/7/etc/rc.d/timed	Tue Mar 24 02:48:54 2009	(r190362)
@@ -6,7 +6,7 @@
 # PROVIDE: timed
 # REQUIRE: DAEMON
 # BEFORE:  LOGIN
-# KEYWORD: nojail
+# KEYWORD: nojail shutdown
 
 . /etc/rc.subr
 

Modified: stable/7/etc/rc.d/ugidfw
==============================================================================
--- stable/7/etc/rc.d/ugidfw	Tue Mar 24 02:28:46 2009	(r190361)
+++ stable/7/etc/rc.d/ugidfw	Tue Mar 24 02:48:54 2009	(r190362)
@@ -4,7 +4,7 @@
 
 # PROVIDE: ugidfw
 # BEFORE: LOGIN
-# KEYWORD: nojail
+# KEYWORD: nojail shutdown
 
 . /etc/rc.subr
 

Modified: stable/7/etc/rc.d/watchdogd
==============================================================================
--- stable/7/etc/rc.d/watchdogd	Tue Mar 24 02:28:46 2009	(r190361)
+++ stable/7/etc/rc.d/watchdogd	Tue Mar 24 02:48:54 2009	(r190362)
@@ -29,7 +29,7 @@
 
 # PROVIDE: watchdogd
 # REQUIRE: DAEMON cleanvar
-# KEYWORD: nojail
+# KEYWORD: nojail shutdown
 
 . /etc/rc.subr
 

Modified: stable/7/etc/rc.d/ypbind
==============================================================================
--- stable/7/etc/rc.d/ypbind	Tue Mar 24 02:28:46 2009	(r190361)
+++ stable/7/etc/rc.d/ypbind	Tue Mar 24 02:48:54 2009	(r190362)
@@ -6,6 +6,7 @@
 # PROVIDE: ypbind
 # REQUIRE: ypserv
 # BEFORE:  DAEMON
+# KEYWORD: shutdown
 
 . /etc/rc.subr
 

Modified: stable/7/etc/rc.d/yppasswdd
==============================================================================
--- stable/7/etc/rc.d/yppasswdd	Tue Mar 24 02:28:46 2009	(r190361)
+++ stable/7/etc/rc.d/yppasswdd	Tue Mar 24 02:48:54 2009	(r190362)
@@ -6,6 +6,7 @@
 # PROVIDE: yppasswdd
 # REQUIRE: ypserv ypbind
 # BEFORE:  LOGIN
+# KEYWORD: shutdown
 
 . /etc/rc.subr
 

Modified: stable/7/etc/rc.d/ypserv
==============================================================================
--- stable/7/etc/rc.d/ypserv	Tue Mar 24 02:28:46 2009	(r190361)
+++ stable/7/etc/rc.d/ypserv	Tue Mar 24 02:48:54 2009	(r190362)
@@ -5,6 +5,7 @@
 
 # PROVIDE: ypserv
 # REQUIRE: rpcbind
+# KEYWORD: shutdown
 
 . /etc/rc.subr
 

Modified: stable/7/etc/rc.d/ypset
==============================================================================
--- stable/7/etc/rc.d/ypset	Tue Mar 24 02:28:46 2009	(r190361)
+++ stable/7/etc/rc.d/ypset	Tue Mar 24 02:48:54 2009	(r190362)
@@ -5,6 +5,7 @@
 
 # PROVIDE: ypset
 # REQUIRE: ypbind
+# KEYWORD: shutdown
 
 . /etc/rc.subr
 

Modified: stable/7/etc/rc.d/ypupdated
==============================================================================
--- stable/7/etc/rc.d/ypupdated	Tue Mar 24 02:28:46 2009	(r190361)
+++ stable/7/etc/rc.d/ypupdated	Tue Mar 24 02:48:54 2009	(r190362)
@@ -5,6 +5,7 @@
 
 # PROVIDE: ypupdated
 # REQUIRE: rpcbind ypserv
+# KEYWORD: shutdown
 
 . /etc/rc.subr
 

Modified: stable/7/etc/rc.d/ypxfrd
==============================================================================
--- stable/7/etc/rc.d/ypxfrd	Tue Mar 24 02:28:46 2009	(r190361)
+++ stable/7/etc/rc.d/ypxfrd	Tue Mar 24 02:48:54 2009	(r190362)
@@ -5,6 +5,7 @@
 
 # PROVIDE: ypxfrd
 # REQUIRE: rpcbind ypserv
+# KEYWORD: shutdown
 
 . /etc/rc.subr