Add an _rc_subr_loaded variable, set to ":" by rc.subr. Scripts can use this

for a speedup by doing: $_rc_subr_loaded . /etc/rc.subr
2004-08-13 18:08:03 +00:00 · 2004-08-13 18:08:03 +00:00 · 7d2e1537c5
parent e0fc84bd24
commit 7d2e1537c5
95 changed files with 191 additions and 189 deletions
--- a/etc/rc.d/accounting
+++ b/etc/rc.d/accounting
@ -1,13 +1,13 @@
 #!/bin/sh
 #
-# $NetBSD: accounting,v 1.7 2002/03/22 04:33:57 thorpej Exp $
+# $NetBSD: accounting,v 1.8 2004/08/13 18:08:03 mycroft Exp $
 #

 # PROVIDE: accounting
 # REQUIRE: mountall
 # BEFORE:  DAEMON

-. /etc/rc.subr
+$_rc_subr_loaded . /etc/rc.subr

 name="accounting"
 rcvar=$name
--- a/etc/rc.d/altqd
+++ b/etc/rc.d/altqd
@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: altqd,v 1.3 2003/03/10 18:17:06 lukem Exp $
+# $NetBSD: altqd,v 1.4 2004/08/13 18:08:03 mycroft Exp $
 #

 # PROVIDE: altqd
@ -8,7 +8,7 @@
 # BEFORE:  SERVERS
 # KEYWORD: shutdown

-. /etc/rc.subr
+$_rc_subr_loaded . /etc/rc.subr

 name="altqd"
 rcvar=$name
--- a/etc/rc.d/amd
+++ b/etc/rc.d/amd
@ -1,13 +1,13 @@
 #!/bin/sh
 #
-# $NetBSD: amd,v 1.10 2002/04/29 12:08:17 lukem Exp $
+# $NetBSD: amd,v 1.11 2004/08/13 18:08:03 mycroft Exp $
 #

 # PROVIDE: amd
 # REQUIRE: rpcbind mountall ypbind
 # BEFORE:  DAEMON

-. /etc/rc.subr
+$_rc_subr_loaded . /etc/rc.subr

 name="amd"
 rcvar=$name
--- a/etc/rc.d/apmd
+++ b/etc/rc.d/apmd
@ -1,13 +1,13 @@
 #!/bin/sh
 #
-# $NetBSD: apmd,v 1.5 2002/03/22 04:33:58 thorpej Exp $
+# $NetBSD: apmd,v 1.6 2004/08/13 18:08:03 mycroft Exp $
 #

 # PROVIDE: apmd
 # REQUIRE: DAEMON
 # BEFORE:  LOGIN

-. /etc/rc.subr
+$_rc_subr_loaded . /etc/rc.subr

 name="apmd"
 rcvar=$name
--- a/etc/rc.d/bootparams
+++ b/etc/rc.d/bootparams
@ -1,13 +1,13 @@
 #!/bin/sh
 #
-# $NetBSD: bootparams,v 1.6 2002/03/22 04:33:58 thorpej Exp $
+# $NetBSD: bootparams,v 1.7 2004/08/13 18:08:03 mycroft Exp $
 #

 # PROVIDE: bootparams
 # REQUIRE: rpcbind DAEMON
 # BEFORE:  LOGIN

-. /etc/rc.subr
+$_rc_subr_loaded . /etc/rc.subr

 name="bootparamd"
 rcvar=$name
--- a/etc/rc.d/ccd
+++ b/etc/rc.d/ccd
@ -1,11 +1,11 @@
 #!/bin/sh
 #
-# $NetBSD: ccd,v 1.4 2003/03/19 08:54:00 wiz Exp $
+# $NetBSD: ccd,v 1.5 2004/08/13 18:08:03 mycroft Exp $
 #

 # PROVIDE: disks

-. /etc/rc.subr
+$_rc_subr_loaded . /etc/rc.subr

 name="ccd"
 rcvar=$name
--- a/etc/rc.d/cgd
+++ b/etc/rc.d/cgd
@ -1,11 +1,11 @@
 #!/bin/sh
 #
-# $NetBSD: cgd,v 1.2 2003/03/19 06:06:48 wiz Exp $
+# $NetBSD: cgd,v 1.3 2004/08/13 18:08:03 mycroft Exp $
 #

 # PROVIDE: disks

-. /etc/rc.subr
+$_rc_subr_loaded . /etc/rc.subr

 name="cgd"
 rcvar=$name
--- a/etc/rc.d/cleartmp
+++ b/etc/rc.d/cleartmp
@ -1,13 +1,13 @@
 #!/bin/sh
 #
-# $NetBSD: cleartmp,v 1.4 2002/03/22 04:33:58 thorpej Exp $
+# $NetBSD: cleartmp,v 1.5 2004/08/13 18:08:03 mycroft Exp $
 #

 # PROVIDE: cleartmp
 # REQUIRE: mountall
 # BEFORE:  DAEMON

-. /etc/rc.subr
+$_rc_subr_loaded . /etc/rc.subr

 name="cleartmp"
 rcvar="clear_tmp"
--- a/etc/rc.d/cron
+++ b/etc/rc.d/cron
@ -1,13 +1,13 @@
 #!/bin/sh
 #
-# $NetBSD: cron,v 1.5 2000/09/19 13:04:38 lukem Exp $
+# $NetBSD: cron,v 1.6 2004/08/13 18:08:03 mycroft Exp $
 #

 # PROVIDE: cron
 # REQUIRE: LOGIN
 # KEYWORD: shutdown

-. /etc/rc.subr
+$_rc_subr_loaded . /etc/rc.subr

 name="cron"
 rcvar=$name
--- a/etc/rc.d/dhclient
+++ b/etc/rc.d/dhclient
@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: dhclient,v 1.8 2002/03/22 04:33:58 thorpej Exp $
+# $NetBSD: dhclient,v 1.9 2004/08/13 18:08:03 mycroft Exp $
 #

 # PROVIDE: dhclient
@ -11,7 +11,7 @@
 #	dhclient needs to start before services that syslog depends upon do.
 #

-. /etc/rc.subr
+$_rc_subr_loaded . /etc/rc.subr

 name="dhclient"
 rcvar=$name
--- a/etc/rc.d/dhcpd
+++ b/etc/rc.d/dhcpd
@ -1,13 +1,13 @@
 #!/bin/sh
 #
-# $NetBSD: dhcpd,v 1.5 2002/03/22 04:33:58 thorpej Exp $
+# $NetBSD: dhcpd,v 1.6 2004/08/13 18:08:03 mycroft Exp $
 #

 # PROVIDE: dhcpd
 # REQUIRE: DAEMON
 # BEFORE:  LOGIN

-. /etc/rc.subr
+$_rc_subr_loaded . /etc/rc.subr

 name="dhcpd"
 rcvar=$name
--- a/etc/rc.d/dhcrelay
+++ b/etc/rc.d/dhcrelay
@ -1,13 +1,13 @@
 #!/bin/sh
 #
-# $NetBSD: dhcrelay,v 1.5 2002/03/22 04:33:58 thorpej Exp $
+# $NetBSD: dhcrelay,v 1.6 2004/08/13 18:08:03 mycroft Exp $
 #

 # PROVIDE: dhcrelay
 # REQUIRE: DAEMON
 # BEFORE:  LOGIN

-. /etc/rc.subr
+$_rc_subr_loaded . /etc/rc.subr

 name="dhcrelay"
 rcvar=$name
--- a/etc/rc.d/dmesg
+++ b/etc/rc.d/dmesg
@ -1,13 +1,13 @@
 #!/bin/sh
 #
-# $NetBSD: dmesg,v 1.8 2002/03/22 04:33:58 thorpej Exp $
+# $NetBSD: dmesg,v 1.9 2004/08/13 18:08:03 mycroft Exp $
 #

 # PROVIDE: dmesg
 # REQUIRE: mountcritremote
 # BEFORE:  DAEMON

-. /etc/rc.subr
+$_rc_subr_loaded . /etc/rc.subr

 name="dmesg"
 rcvar=$name
--- a/etc/rc.d/fixsb
+++ b/etc/rc.d/fixsb
@ -1,13 +1,13 @@
 #!/bin/sh
 #
-# $NetBSD: fixsb,v 1.10 2004/04/23 10:59:47 keihan Exp $
+# $NetBSD: fixsb,v 1.11 2004/08/13 18:08:03 mycroft Exp $
 #

 # PROVIDE: fixsb
 # REQUIRE: localswap
 # BEFORE: fsck

-. /etc/rc.subr
+$_rc_subr_loaded . /etc/rc.subr

 name="fixsb"
 rcvar=$name
--- a/etc/rc.d/fsck
+++ b/etc/rc.d/fsck
@ -1,12 +1,12 @@
 #!/bin/sh
 #
-# $NetBSD: fsck,v 1.4 2003/10/20 15:02:15 christos Exp $
+# $NetBSD: fsck,v 1.5 2004/08/13 18:08:03 mycroft Exp $
 #

 # PROVIDE: fsck
 # REQUIRE: localswap

-. /etc/rc.subr
+$_rc_subr_loaded . /etc/rc.subr

 name="fsck"
 start_cmd="fsck_start"
--- a/etc/rc.d/identd
+++ b/etc/rc.d/identd
@ -1,13 +1,13 @@
 #!/bin/sh
 #
-# $NetBSD: identd,v 1.1 2004/01/31 21:50:45 christos Exp $
+# $NetBSD: identd,v 1.2 2004/08/13 18:08:03 mycroft Exp $
 #

 # PROVIDE: identd
 # REQUIRE: DAEMON
 # KEYWORD: shutdown

-. /etc/rc.subr
+$_rc_subr_loaded . /etc/rc.subr

 name="identd"
 rcvar=$name
--- a/etc/rc.d/ifwatchd
+++ b/etc/rc.d/ifwatchd
@ -1,13 +1,13 @@
 #!/bin/sh
 #
-# $NetBSD: ifwatchd,v 1.3 2003/06/24 09:32:46 martin Exp $
+# $NetBSD: ifwatchd,v 1.4 2004/08/13 18:08:03 mycroft Exp $
 #

 # PROVIDE: ifwatchd
 # REQUIRE: mountcritremote syslogd
 # BEFORE: SERVERS

-. /etc/rc.subr
+$_rc_subr_loaded . /etc/rc.subr

 name="ifwatchd"
 rcvar=$name
--- a/etc/rc.d/inetd
+++ b/etc/rc.d/inetd
@ -1,13 +1,13 @@
 #!/bin/sh
 #
-# $NetBSD: inetd,v 1.6 2000/09/19 13:04:38 lukem Exp $
+# $NetBSD: inetd,v 1.7 2004/08/13 18:08:03 mycroft Exp $
 #

 # PROVIDE: inetd
 # REQUIRE: DAEMON LOGIN
 # KEYWORD: shutdown

-. /etc/rc.subr
+$_rc_subr_loaded . /etc/rc.subr

 name="inetd"
 rcvar=$name
--- a/etc/rc.d/ipfilter
+++ b/etc/rc.d/ipfilter
@ -1,12 +1,12 @@
 #!/bin/sh
 #
-# $NetBSD: ipfilter,v 1.10 2001/02/28 17:03:50 lukem Exp $
+# $NetBSD: ipfilter,v 1.11 2004/08/13 18:08:03 mycroft Exp $
 #

 # PROVIDE: ipfilter
 # REQUIRE: root beforenetlkm mountcritlocal tty

-. /etc/rc.subr
+$_rc_subr_loaded . /etc/rc.subr

 name="ipfilter"
 rcvar=$name
--- a/etc/rc.d/ipfs
+++ b/etc/rc.d/ipfs
@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: ipfs,v 1.6 2004/07/05 08:21:15 lukem Exp $
+# $NetBSD: ipfs,v 1.7 2004/08/13 18:08:03 mycroft Exp $
 #

 # PROVIDE: ipfs
@ -8,7 +8,7 @@
 # BEFORE:  SERVERS
 # KEYWORD: shutdown

-. /etc/rc.subr
+$_rc_subr_loaded . /etc/rc.subr

 name="ipfs"
 rcvar=$name
--- a/etc/rc.d/ipmon
+++ b/etc/rc.d/ipmon
@ -1,13 +1,13 @@
 #!/bin/sh
 #
-# $NetBSD: ipmon,v 1.11 2004/04/04 13:59:36 mrg Exp $
+# $NetBSD: ipmon,v 1.12 2004/08/13 18:08:03 mycroft Exp $
 #

 # PROVIDE: ipmon
 # REQUIRE: syslogd
 # BEFORE:  SERVERS

-. /etc/rc.subr
+$_rc_subr_loaded . /etc/rc.subr

 name="ipmon"
 rcvar=$name
--- a/etc/rc.d/ipnat
+++ b/etc/rc.d/ipnat
@ -1,13 +1,13 @@
 #!/bin/sh
 #
-# $NetBSD: ipnat,v 1.10 2003/08/22 08:43:26 mrg Exp $
+# $NetBSD: ipnat,v 1.11 2004/08/13 18:08:03 mycroft Exp $
 #

 # PROVIDE: ipnat
 # REQUIRE: ipfilter mountcritremote
 # BEFORE:  SERVERS

-. /etc/rc.subr
+$_rc_subr_loaded . /etc/rc.subr

 name="ipnat"
 rcvar=$name
--- a/etc/rc.d/ipsec
+++ b/etc/rc.d/ipsec
@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: ipsec,v 1.7 2002/03/22 04:33:58 thorpej Exp $
+# $NetBSD: ipsec,v 1.8 2004/08/13 18:08:03 mycroft Exp $
 #

 # PROVIDE: ipsec
@ -9,7 +9,7 @@

 #	it does not really require beforenetlkm.

-. /etc/rc.subr
+$_rc_subr_loaded . /etc/rc.subr

 name="ipsec"
 rcvar=$name
--- a/etc/rc.d/isdnd
+++ b/etc/rc.d/isdnd
@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: isdnd,v 1.9 2002/04/10 23:37:13 martin Exp $
+# $NetBSD: isdnd,v 1.10 2004/08/13 18:08:03 mycroft Exp $
 #

 # PROVIDE: isdnd
@ -11,7 +11,7 @@
 #	any isdn addresses.  This is considered a feature.
 #

-. /etc/rc.subr
+$_rc_subr_loaded . /etc/rc.subr

 name="isdnd"
 rcvar=$name
--- a/etc/rc.d/kdc
+++ b/etc/rc.d/kdc
@ -1,13 +1,13 @@
 #!/bin/sh
 #
-# $NetBSD: kdc,v 1.5 2002/03/22 04:33:58 thorpej Exp $
+# $NetBSD: kdc,v 1.6 2004/08/13 18:08:03 mycroft Exp $
 #

 # PROVIDE: kdc
 # REQUIRE: NETWORKING
 # BEFORE:  SERVERS

-. /etc/rc.subr
+$_rc_subr_loaded . /etc/rc.subr

 name="kdc"
 rcvar=$name
--- a/etc/rc.d/ldconfig
+++ b/etc/rc.d/ldconfig
@ -1,13 +1,13 @@
 #!/bin/sh
 #
-# $NetBSD: ldconfig,v 1.7 2004/06/03 16:29:15 abs Exp $
+# $NetBSD: ldconfig,v 1.8 2004/08/13 18:08:03 mycroft Exp $
 #

 # PROVIDE: ldconfig
 # REQUIRE: mountall
 # BEFORE:  DAEMON

-. /etc/rc.subr
+$_rc_subr_loaded . /etc/rc.subr

 name="ldconfig"
 rcvar="ldconfig"
--- a/etc/rc.d/lkm1
+++ b/etc/rc.d/lkm1
@ -1,12 +1,12 @@
 #!/bin/sh
 #
-# $NetBSD: lkm1,v 1.7 2002/10/08 16:21:52 atatat Exp $
+# $NetBSD: lkm1,v 1.8 2004/08/13 18:08:03 mycroft Exp $
 #

 # PROVIDE: beforenetlkm
 # REQUIRE: root bootconf

-. /etc/rc.subr
+$_rc_subr_loaded . /etc/rc.subr

 name="lkm1"
 rcvar="lkm"
--- a/etc/rc.d/lkm2
+++ b/etc/rc.d/lkm2
@ -1,12 +1,12 @@
 #!/bin/sh
 #
-# $NetBSD: lkm2,v 1.5 2002/10/08 16:21:52 atatat Exp $
+# $NetBSD: lkm2,v 1.6 2004/08/13 18:08:03 mycroft Exp $
 #

 # PROVIDE: beforemountlkm
 # REQUIRE: syslogd

-. /etc/rc.subr
+$_rc_subr_loaded . /etc/rc.subr

 name="lkm2"
 rcvar="lkm"
--- a/etc/rc.d/lkm3
+++ b/etc/rc.d/lkm3
@ -1,13 +1,13 @@
 #!/bin/sh
 #
-# $NetBSD: lkm3,v 1.7 2002/10/08 16:21:52 atatat Exp $
+# $NetBSD: lkm3,v 1.8 2004/08/13 18:08:03 mycroft Exp $
 #

 # PROVIDE: aftermountlkm
 # REQUIRE: mountall
 # BEFORE:  DAEMON

-. /etc/rc.subr
+$_rc_subr_loaded . /etc/rc.subr

 name="lkm3"
 rcvar="lkm"
--- a/etc/rc.d/local
+++ b/etc/rc.d/local
@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: local,v 1.6 2002/03/22 04:33:59 thorpej Exp $
+# $NetBSD: local,v 1.7 2004/08/13 18:08:03 mycroft Exp $
 #

 # REQUIRE: DAEMON
@ -8,7 +8,7 @@
 # BEFORE:  LOGIN
 # KEYWORD: shutdown

-. /etc/rc.subr
+$_rc_subr_loaded . /etc/rc.subr

 name="local"
 start_cmd="local_start"
--- a/etc/rc.d/lpd
+++ b/etc/rc.d/lpd
@ -1,13 +1,13 @@
 #!/bin/sh
 #
-# $NetBSD: lpd,v 1.5 2002/03/22 04:33:59 thorpej Exp $
+# $NetBSD: lpd,v 1.6 2004/08/13 18:08:03 mycroft Exp $
 #

 # PROVIDE: lpd
 # REQUIRE: DAEMON
 # BEFORE:  LOGIN

-. /etc/rc.subr
+$_rc_subr_loaded . /etc/rc.subr

 name="lpd"
 rcvar=$name
--- a/etc/rc.d/mixerctl
+++ b/etc/rc.d/mixerctl
@ -1,13 +1,13 @@
 #!/bin/sh
 #
-# $NetBSD: mixerctl,v 1.7 2004/01/11 13:57:56 uebayasi Exp $
+# $NetBSD: mixerctl,v 1.8 2004/08/13 18:08:03 mycroft Exp $
 #

 # PROVIDE: mixerctl
 # REQUIRE: mountcritremote
 # KEYWORD: shutdown

-. /etc/rc.subr
+$_rc_subr_loaded . /etc/rc.subr

 name="mixerctl"
 rcvar=$name
--- a/etc/rc.d/mopd
+++ b/etc/rc.d/mopd
@ -1,13 +1,13 @@
 #!/bin/sh
 #
-# $NetBSD: mopd,v 1.5 2002/03/22 04:33:59 thorpej Exp $
+# $NetBSD: mopd,v 1.6 2004/08/13 18:08:03 mycroft Exp $
 #

 # PROVIDE: mopd
 # REQUIRE: DAEMON
 # BEFORE:  LOGIN

-. /etc/rc.subr
+$_rc_subr_loaded . /etc/rc.subr

 name="mopd"
 rcvar=$name
--- a/etc/rc.d/motd
+++ b/etc/rc.d/motd
@ -1,13 +1,13 @@
 #!/bin/sh
 #
-# $NetBSD: motd,v 1.8 2002/03/22 04:33:59 thorpej Exp $
+# $NetBSD: motd,v 1.9 2004/08/13 18:08:03 mycroft Exp $
 #

 # PROVIDE: motd
 # REQUIRE: mountcritremote
 # BEFORE:  LOGIN

-. /etc/rc.subr
+$_rc_subr_loaded . /etc/rc.subr

 name="motd"
 rcvar="update_motd"
--- a/etc/rc.d/mountall
+++ b/etc/rc.d/mountall
@ -1,12 +1,12 @@
 #!/bin/sh
 #
-# $NetBSD: mountall,v 1.3 2000/05/13 08:45:07 lukem Exp $
+# $NetBSD: mountall,v 1.4 2004/08/13 18:08:03 mycroft Exp $
 #

 # PROVIDE: mountall
 # REQUIRE: beforemountlkm

-. /etc/rc.subr
+$_rc_subr_loaded . /etc/rc.subr

 name="mountall"
 start_cmd="echo 'Mounting all filesystems...'; mount -a"
--- a/etc/rc.d/mountcritlocal
+++ b/etc/rc.d/mountcritlocal
@ -1,12 +1,12 @@
 #!/bin/sh
 #
-# $NetBSD: mountcritlocal,v 1.7 2002/04/29 12:29:53 lukem Exp $
+# $NetBSD: mountcritlocal,v 1.8 2004/08/13 18:08:03 mycroft Exp $
 #

 # PROVIDE: mountcritlocal
 # REQUIRE: root

-. /etc/rc.subr
+$_rc_subr_loaded . /etc/rc.subr

 name="mountcritlocal"
 start_cmd="mountcritlocal_start"
--- a/etc/rc.d/mountcritremote
+++ b/etc/rc.d/mountcritremote
@ -1,12 +1,12 @@
 #!/bin/sh
 #
-# $NetBSD: mountcritremote,v 1.7 2002/04/29 12:29:53 lukem Exp $
+# $NetBSD: mountcritremote,v 1.8 2004/08/13 18:08:03 mycroft Exp $
 #

 # PROVIDE: mountcritremote
 # REQUIRE: NETWORKING root mountcritlocal

-. /etc/rc.subr
+$_rc_subr_loaded . /etc/rc.subr

 name="mountcritremote"
 start_cmd="mountcritremote_start"
--- a/etc/rc.d/mountd
+++ b/etc/rc.d/mountd
@ -1,12 +1,12 @@
 #!/bin/sh
 #
-# $NetBSD: mountd,v 1.11 2002/01/31 01:26:06 lukem Exp $
+# $NetBSD: mountd,v 1.12 2004/08/13 18:08:03 mycroft Exp $
 #

 # PROVIDE: mountd
 # REQUIRE: NETWORKING mountall beforemountlkm rpcbind quota

-. /etc/rc.subr
+$_rc_subr_loaded . /etc/rc.subr

 name="mountd"
 rcvar=$name
--- a/etc/rc.d/moused
+++ b/etc/rc.d/moused
@ -1,12 +1,12 @@
 #!/bin/sh
 #
-# $NetBSD: moused,v 1.1 2001/10/29 23:25:01 augustss Exp $
+# $NetBSD: moused,v 1.2 2004/08/13 18:08:03 mycroft Exp $
 #

 # PROVIDE: moused
 # REQUIRE: DAEMON

-. /etc/rc.subr
+$_rc_subr_loaded . /etc/rc.subr

 name="moused"
 rcvar=$name
--- a/etc/rc.d/mrouted
+++ b/etc/rc.d/mrouted
@ -1,13 +1,13 @@
 #!/bin/sh
 #
-# $NetBSD: mrouted,v 1.6 2002/03/22 04:33:59 thorpej Exp $
+# $NetBSD: mrouted,v 1.7 2004/08/13 18:08:03 mycroft Exp $
 #

 # PROVIDE: mrouted
 # REQUIRE: DAEMON
 # BEFORE:  LOGIN

-. /etc/rc.subr
+$_rc_subr_loaded . /etc/rc.subr

 name="mrouted"
 rcvar=$name
--- a/etc/rc.d/named
+++ b/etc/rc.d/named
@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: named,v 1.13 2004/05/21 15:40:22 christos Exp $
+# $NetBSD: named,v 1.14 2004/08/13 18:08:03 mycroft Exp $
 #

 # PROVIDE: named
@ -8,7 +8,7 @@
 # BEFORE:  DAEMON
 # KEYWORD: chrootdir

-. /etc/rc.subr
+$_rc_subr_loaded . /etc/rc.subr

 name="named"
 rcvar=$name
--- a/etc/rc.d/ndbootd
+++ b/etc/rc.d/ndbootd
@ -1,12 +1,12 @@
 #!/bin/sh
 #
-# $NetBSD: ndbootd,v 1.1 2001/05/22 14:51:37 fredette Exp $
+# $NetBSD: ndbootd,v 1.2 2004/08/13 18:08:03 mycroft Exp $
 #

 # PROVIDE: ndbootd
 # REQUIRE: DAEMON

-. /etc/rc.subr
+$_rc_subr_loaded . /etc/rc.subr

 name="ndbootd"
 rcvar=$name
--- a/etc/rc.d/network
+++ b/etc/rc.d/network
@ -1,13 +1,13 @@
 #!/bin/sh
 #
-# $NetBSD: network,v 1.44 2003/10/12 09:50:05 jdc Exp $
+# $NetBSD: network,v 1.45 2004/08/13 18:08:03 mycroft Exp $
 #

 # PROVIDE: network
 # REQUIRE: ipfilter ipsec mountcritlocal root tty sysctl
 # BEFORE:  NETWORKING

-. /etc/rc.subr
+$_rc_subr_loaded . /etc/rc.subr

 name="network"
 start_cmd="network_start"
--- a/etc/rc.d/newsyslog
+++ b/etc/rc.d/newsyslog
@ -1,13 +1,13 @@
 #!/bin/sh
 #
-# $NetBSD: newsyslog,v 1.5 2002/03/24 15:51:26 lukem Exp $
+# $NetBSD: newsyslog,v 1.6 2004/08/13 18:08:03 mycroft Exp $
 #

 # PROVIDE: newsyslog
 # REQUIRE: mountcritremote sysdb
 # BEFORE:  syslogd SERVERS

-. /etc/rc.subr
+$_rc_subr_loaded . /etc/rc.subr

 name="newsyslog"
 rcvar=$name
--- a/etc/rc.d/nfsd
+++ b/etc/rc.d/nfsd
@ -1,12 +1,12 @@
 #!/bin/sh
 #
-# $NetBSD: nfsd,v 1.4 2001/06/16 06:13:10 lukem Exp $
+# $NetBSD: nfsd,v 1.5 2004/08/13 18:08:03 mycroft Exp $
 #

 # PROVIDE: nfsd
 # REQUIRE: mountd

-. /etc/rc.subr
+$_rc_subr_loaded . /etc/rc.subr

 name="nfsd"
 rcvar="nfs_server"
--- a/etc/rc.d/nfslocking
+++ b/etc/rc.d/nfslocking
@ -1,13 +1,13 @@
 #!/bin/sh
 #
-# $NetBSD: nfslocking,v 1.6 2002/03/24 15:52:41 lukem Exp $
+# $NetBSD: nfslocking,v 1.7 2004/08/13 18:08:03 mycroft Exp $
 #

 # PROVIDE: nfslocking
 # REQUIRE: nfsd
 # BEFORE:  DAEMON

-. /etc/rc.subr
+$_rc_subr_loaded . /etc/rc.subr

 arg=$1

--- a/etc/rc.d/ntpd
+++ b/etc/rc.d/ntpd
@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: ntpd,v 1.12 2004/03/31 18:01:07 fredb Exp $
+# $NetBSD: ntpd,v 1.13 2004/08/13 18:08:03 mycroft Exp $
 #

 # PROVIDE: ntpd
@ -8,7 +8,7 @@
 # BEFORE:  LOGIN
 # KEYWORD: chrootdir

-. /etc/rc.subr
+$_rc_subr_loaded . /etc/rc.subr

 name="ntpd"
 rcvar=$name
--- a/etc/rc.d/ntpdate
+++ b/etc/rc.d/ntpdate
@ -1,12 +1,12 @@
 #!/bin/sh
 #
-# $NetBSD: ntpdate,v 1.15 2003/12/04 18:28:54 drochner Exp $
+# $NetBSD: ntpdate,v 1.16 2004/08/13 18:08:03 mycroft Exp $
 #

 # PROVIDE: ntpdate
 # REQUIRE: NETWORKING syslogd

-. /etc/rc.subr
+$_rc_subr_loaded . /etc/rc.subr

 name="ntpdate"
 rcvar=$name
--- a/etc/rc.d/pf
+++ b/etc/rc.d/pf
@ -1,13 +1,13 @@
 #!/bin/sh
 #
-# $NetBSD: pf,v 1.1 2004/06/29 04:48:28 itojun Exp $
+# $NetBSD: pf,v 1.2 2004/08/13 18:08:03 mycroft Exp $
 #

 # PROVIDE: pf
 # REQUIRE: NETWORKING
 # BEFORE: SERVERS

-. /etc/rc.subr
+$_rc_subr_loaded . /etc/rc.subr

 name="pf"
 rcvar=$name
--- a/etc/rc.d/pflogd
+++ b/etc/rc.d/pflogd
@ -1,13 +1,13 @@
 #!/bin/sh
 #
-# $NetBSD: pflogd,v 1.1 2004/06/29 04:48:28 itojun Exp $
+# $NetBSD: pflogd,v 1.2 2004/08/13 18:08:03 mycroft Exp $
 #

 # PROVIDE: pflogd
 # REQUIRE: pf
 # BEFORE:  SERVERS

-. /etc/rc.subr
+$_rc_subr_loaded . /etc/rc.subr

 name="pflogd"
 rcvar=$name
--- a/etc/rc.d/poffd
+++ b/etc/rc.d/poffd
@ -1,12 +1,12 @@
 #!/bin/sh
 #
-# $NetBSD: poffd,v 1.1 2001/01/14 15:37:22 minoura Exp $
+# $NetBSD: poffd,v 1.2 2004/08/13 18:08:03 mycroft Exp $
 #

 # PROVIDE: poffd
 # REQUIRE: DAEMON

-. /etc/rc.subr
+$_rc_subr_loaded . /etc/rc.subr

 name="poffd"
 rcvar=$name
--- a/etc/rc.d/postfix
+++ b/etc/rc.d/postfix
@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: postfix,v 1.8 2004/04/08 06:15:27 lukem Exp $
+# $NetBSD: postfix,v 1.9 2004/08/13 18:08:03 mycroft Exp $
 #

 # PROVIDE: mail
@ -8,7 +8,7 @@
 #	we make mail start late, so that things like .forward's are not
 #	processed until the system is fully operational

-. /etc/rc.subr
+$_rc_subr_loaded . /etc/rc.subr

 name="postfix"
 rcvar=$name
--- a/etc/rc.d/powerd
+++ b/etc/rc.d/powerd
@ -1,13 +1,13 @@
 #!/bin/sh
 #
-# $NetBSD: powerd,v 1.1 2003/04/18 05:19:35 thorpej Exp $
+# $NetBSD: powerd,v 1.2 2004/08/13 18:08:03 mycroft Exp $
 #

 # PROVIDE: powerd
 # REQUIRE: DAEMON
 # BEFORE:  LOGIN

-. /etc/rc.subr
+$_rc_subr_loaded . /etc/rc.subr

 name="powerd"
 rcvar=$name
--- a/etc/rc.d/ppp
+++ b/etc/rc.d/ppp
@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: ppp,v 1.6 2002/03/22 04:33:59 thorpej Exp $
+# $NetBSD: ppp,v 1.7 2004/08/13 18:08:03 mycroft Exp $
 #

 # PROVIDE: ppp
@ -11,7 +11,7 @@
 #	any PPP addresses.  This is considered a feature.
 #

-. /etc/rc.subr
+$_rc_subr_loaded . /etc/rc.subr

 name="ppp"
 start_cmd="ppp_start"
--- a/etc/rc.d/pwcheck
+++ b/etc/rc.d/pwcheck
@ -1,13 +1,13 @@
 #!/bin/sh
 #
-# $NetBSD: pwcheck,v 1.4 2002/03/22 04:33:59 thorpej Exp $
+# $NetBSD: pwcheck,v 1.5 2004/08/13 18:08:03 mycroft Exp $
 #

 # PROVIDE: pwcheck
 # REQUIRE: mountcritremote syslogd
 # BEFORE:  DAEMON

-. /etc/rc.subr
+$_rc_subr_loaded . /etc/rc.subr

 name="pwcheck"
 start_cmd="pwcheck_start"
--- a/etc/rc.d/quota
+++ b/etc/rc.d/quota
@ -1,13 +1,13 @@
 #!/bin/sh
 #
-# $NetBSD: quota,v 1.4 2004/06/03 16:27:44 abs Exp $
+# $NetBSD: quota,v 1.5 2004/08/13 18:08:03 mycroft Exp $
 #

 # PROVIDE: quota
 # REQUIRE: mountall
 # BEFORE:  DAEMON

-. /etc/rc.subr
+$_rc_subr_loaded . /etc/rc.subr

 name="quota"
 rcvar="quota"
--- a/etc/rc.d/racoon
+++ b/etc/rc.d/racoon
@ -1,13 +1,13 @@
 #!/bin/sh
 #
-# $NetBSD: racoon,v 1.3 2002/03/22 04:33:59 thorpej Exp $
+# $NetBSD: racoon,v 1.4 2004/08/13 18:08:03 mycroft Exp $
 #

 # PROVIDE: ike
 # REQUIRE: isdnd kdc ppp
 # BEFORE:  SERVERS

-. /etc/rc.subr
+$_rc_subr_loaded . /etc/rc.subr

 name="racoon"
 rcvar=$name
--- a/etc/rc.d/raidframe
+++ b/etc/rc.d/raidframe
@ -1,11 +1,11 @@
 #!/bin/sh
 #
-# $NetBSD: raidframe,v 1.8 2003/09/10 14:50:20 wiz Exp $
+# $NetBSD: raidframe,v 1.9 2004/08/13 18:08:03 mycroft Exp $
 #

 # PROVIDE: disks

-. /etc/rc.subr
+$_rc_subr_loaded . /etc/rc.subr

 name="raidframe"
 rcvar=$name
--- a/etc/rc.d/raidframeparity
+++ b/etc/rc.d/raidframeparity
@ -1,11 +1,11 @@
 #!/bin/sh
 #
-# $NetBSD: raidframeparity,v 1.1 2002/09/03 15:35:55 abs Exp $
+# $NetBSD: raidframeparity,v 1.2 2004/08/13 18:08:03 mycroft Exp $
 #

 # REQUIRE: quota

-. /etc/rc.subr
+$_rc_subr_loaded . /etc/rc.subr

 name="raidframeparity"
 start_cmd="raidframeparity_start"
--- a/etc/rc.d/rarpd
+++ b/etc/rc.d/rarpd
@ -1,13 +1,13 @@
 #!/bin/sh
 #
-# $NetBSD: rarpd,v 1.5 2002/03/22 04:33:59 thorpej Exp $
+# $NetBSD: rarpd,v 1.6 2004/08/13 18:08:03 mycroft Exp $
 #

 # PROVIDE: rarpd
 # REQUIRE: DAEMON
 # BEFORE:  LOGIN

-. /etc/rc.subr
+$_rc_subr_loaded . /etc/rc.subr

 name="rarpd"
 rcvar=$name
--- a/etc/rc.d/rbootd
+++ b/etc/rc.d/rbootd
@ -1,13 +1,13 @@
 #!/bin/sh
 #
-# $NetBSD: rbootd,v 1.6 2002/03/22 04:34:00 thorpej Exp $
+# $NetBSD: rbootd,v 1.7 2004/08/13 18:08:03 mycroft Exp $
 #

 # PROVIDE: rbootd
 # REQUIRE: DAEMON
 # BEFORE:  LOGIN

-. /etc/rc.subr
+$_rc_subr_loaded . /etc/rc.subr

 name="rbootd"
 rcvar=$name
--- a/etc/rc.d/root
+++ b/etc/rc.d/root
@ -1,12 +1,12 @@
 #!/bin/sh
 #
-# $NetBSD: root,v 1.2 2000/05/13 08:45:09 lukem Exp $
+# $NetBSD: root,v 1.3 2004/08/13 18:08:03 mycroft Exp $
 #

 # PROVIDE: root
 # REQUIRE: fsck

-. /etc/rc.subr
+$_rc_subr_loaded . /etc/rc.subr

 name="root"
 start_cmd="root_start"
--- a/etc/rc.d/route6d
+++ b/etc/rc.d/route6d
@ -1,13 +1,13 @@
 #!/bin/sh
 #
-# $NetBSD: route6d,v 1.5 2002/03/22 04:34:00 thorpej Exp $
+# $NetBSD: route6d,v 1.6 2004/08/13 18:08:03 mycroft Exp $
 #

 # PROVIDE: route6d
 # REQUIRE: DAEMON
 # BEFORE:  LOGIN

-. /etc/rc.subr
+$_rc_subr_loaded . /etc/rc.subr

 name="route6d"
 rcvar=$name
--- a/etc/rc.d/routed
+++ b/etc/rc.d/routed
@ -1,13 +1,13 @@
 #!/bin/sh
 #
-# $NetBSD: routed,v 1.7 2002/03/22 04:34:00 thorpej Exp $
+# $NetBSD: routed,v 1.8 2004/08/13 18:08:03 mycroft Exp $
 #

 # PROVIDE: routed
 # REQUIRE: DAEMON
 # BEFORE:  LOGIN

-. /etc/rc.subr
+$_rc_subr_loaded . /etc/rc.subr

 name="routed"
 rcvar=$name
--- a/etc/rc.d/rpcbind
+++ b/etc/rc.d/rpcbind
@ -1,12 +1,12 @@
 #!/bin/sh
 #
-# $NetBSD: rpcbind,v 1.6 2002/01/31 01:26:06 lukem Exp $
+# $NetBSD: rpcbind,v 1.7 2004/08/13 18:08:03 mycroft Exp $
 #

 # PROVIDE: rpcbind
 # REQUIRE: NETWORKING ntpdate syslogd named ppp

-. /etc/rc.subr
+$_rc_subr_loaded . /etc/rc.subr

 name="rpcbind"
 rcvar=$name
--- a/etc/rc.d/rtadvd
+++ b/etc/rc.d/rtadvd
@ -1,13 +1,13 @@
 #!/bin/sh
 #
-# $NetBSD: rtadvd,v 1.5 2002/03/22 04:34:00 thorpej Exp $
+# $NetBSD: rtadvd,v 1.6 2004/08/13 18:08:03 mycroft Exp $
 #

 # PROVIDE: rtadvd
 # REQUIRE: DAEMON
 # BEFORE:  LOGIN

-. /etc/rc.subr
+$_rc_subr_loaded . /etc/rc.subr

 name="rtadvd"
 rcvar=$name
--- a/etc/rc.d/rtclocaltime
+++ b/etc/rc.d/rtclocaltime
@ -1,13 +1,13 @@
 #!/bin/sh
 #
-# $NetBSD: rtclocaltime,v 1.2 2004/04/25 16:52:19 schmonz Exp $
+# $NetBSD: rtclocaltime,v 1.3 2004/08/13 18:08:03 mycroft Exp $
 #

 # PROVIDE: rtclocaltime
 # REQUIRE: mountcritremote
 # BEFORE:  ntpdate ntpd

-. /etc/rc.subr
+$_rc_subr_loaded . /etc/rc.subr

 name="rtclocaltime"
 rcvar=$name
--- a/etc/rc.d/rtsold
+++ b/etc/rc.d/rtsold
@ -1,13 +1,13 @@
 #!/bin/sh
 #
-# $NetBSD: rtsold,v 1.5 2002/03/22 04:34:00 thorpej Exp $
+# $NetBSD: rtsold,v 1.6 2004/08/13 18:08:03 mycroft Exp $
 #

 # PROVIDE: rtsold
 # REQUIRE: DAEMON
 # BEFORE:  LOGIN

-. /etc/rc.subr
+$_rc_subr_loaded . /etc/rc.subr

 name="rtsold"
 rcvar=$name
--- a/etc/rc.d/rwho
+++ b/etc/rc.d/rwho
@ -1,13 +1,13 @@
 #!/bin/sh
 #
-# $NetBSD: rwho,v 1.5 2002/03/22 04:34:00 thorpej Exp $
+# $NetBSD: rwho,v 1.6 2004/08/13 18:08:03 mycroft Exp $
 #

 # PROVIDE: rwho
 # REQUIRE: DAEMON
 # BEFORE:  LOGIN

-. /etc/rc.subr
+$_rc_subr_loaded . /etc/rc.subr

 name="rwhod"
 rcvar=$name
--- a/etc/rc.d/savecore
+++ b/etc/rc.d/savecore
@ -1,13 +1,13 @@
 #!/bin/sh
 #
-# $NetBSD: savecore,v 1.6 2004/07/15 03:29:55 atatat Exp $
+# $NetBSD: savecore,v 1.7 2004/08/13 18:08:03 mycroft Exp $
 #

 # PROVIDE: savecore
 # REQUIRE: syslogd
 # BEFORE:  SERVERS

-. /etc/rc.subr
+$_rc_subr_loaded . /etc/rc.subr

 name="savecore"
 rcvar=$name
--- a/etc/rc.d/screenblank
+++ b/etc/rc.d/screenblank
@ -1,13 +1,13 @@
 #!/bin/sh
 #
-# $NetBSD: screenblank,v 1.5 2002/03/22 04:34:00 thorpej Exp $
+# $NetBSD: screenblank,v 1.6 2004/08/13 18:08:03 mycroft Exp $
 #

 # PROVIDE: screenblank
 # REQUIRE: DAEMON
 # BEFORE:  LOGIN

-. /etc/rc.subr
+$_rc_subr_loaded . /etc/rc.subr

 name="screenblank"
 rcvar=$name
--- a/etc/rc.d/securelevel
+++ b/etc/rc.d/securelevel
@ -1,13 +1,13 @@
 #!/bin/sh
 #
-# $NetBSD: securelevel,v 1.4 2002/03/22 04:34:00 thorpej Exp $
+# $NetBSD: securelevel,v 1.5 2004/08/13 18:08:03 mycroft Exp $
 #

 # PROVIDE: securelevel
 # REQUIRE: aftermountlkm ipnat mountd
 # BEFORE:  DAEMON

-. /etc/rc.subr
+$_rc_subr_loaded . /etc/rc.subr

 name="securelevel"
 start_cmd="securelevel_start"
--- a/etc/rc.d/sendmail
+++ b/etc/rc.d/sendmail
@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: sendmail,v 1.19 2004/08/08 17:41:15 atatat Exp $
+# $NetBSD: sendmail,v 1.20 2004/08/13 18:08:03 mycroft Exp $
 #

 # PROVIDE: mail
@ -8,7 +8,7 @@
 #	we make mail start late, so that things like .forward's are not
 #	processed until the system is fully operational

-. /etc/rc.subr
+$_rc_subr_loaded . /etc/rc.subr

 name="sendmail"
 rcvar=$name
--- a/etc/rc.d/smmsp
+++ b/etc/rc.d/smmsp
@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: smmsp,v 1.2 2003/04/02 18:00:14 atatat Exp $
+# $NetBSD: smmsp,v 1.3 2004/08/13 18:08:03 mycroft Exp $
 #

 # REQUIRE: mail
@ -14,7 +14,7 @@
 #	replacement for hosts that were previously using a "null
 #	client" configuration and a smart relay.

-. /etc/rc.subr
+$_rc_subr_loaded . /etc/rc.subr

 name="smmsp"
 rcvar=$name
--- a/etc/rc.d/sshd
+++ b/etc/rc.d/sshd
@ -1,12 +1,12 @@
 #!/bin/sh
 #
-# $NetBSD: sshd,v 1.19 2004/02/18 17:36:34 jonb Exp $
+# $NetBSD: sshd,v 1.20 2004/08/13 18:08:03 mycroft Exp $
 #

 # PROVIDE: sshd
 # REQUIRE: LOGIN

-. /etc/rc.subr
+$_rc_subr_loaded . /etc/rc.subr

 name="sshd"
 rcvar=$name
--- a/etc/rc.d/staticroute
+++ b/etc/rc.d/staticroute
@ -1,13 +1,13 @@
 #!/bin/sh
 #
-# $NetBSD: staticroute,v 1.1 2003/01/09 15:57:02 christos Exp $
+# $NetBSD: staticroute,v 1.2 2004/08/13 18:08:03 mycroft Exp $
 #

 # PROVIDE: staticroute
 # REQUIRE: network
 # BEFORE:  NETWORKING

-. /etc/rc.subr
+$_rc_subr_loaded . /etc/rc.subr

 name="staticroute"
 start_cmd="staticroute_doit Adding add"
--- a/etc/rc.d/swap1
+++ b/etc/rc.d/swap1
@ -1,13 +1,13 @@
 #!/bin/sh
 #
-# $NetBSD: swap1,v 1.8 2002/03/24 15:52:41 lukem Exp $
+# $NetBSD: swap1,v 1.9 2004/08/13 18:08:03 mycroft Exp $
 #

 # PROVIDE: localswap
 # REQUIRE: disks
 # KEYWORD: shutdown

-. /etc/rc.subr
+$_rc_subr_loaded . /etc/rc.subr

 name="swap1"
 start_cmd="swap1_start"
--- a/etc/rc.d/swap2
+++ b/etc/rc.d/swap2
@ -1,13 +1,13 @@
 #!/bin/sh
 #
-# $NetBSD: swap2,v 1.6 2002/03/22 04:34:00 thorpej Exp $
+# $NetBSD: swap2,v 1.7 2004/08/13 18:08:03 mycroft Exp $
 #

 # PROVIDE: nonlocalswap
 # REQUIRE: mountcritremote
 # BEFORE:  DAEMON

-. /etc/rc.subr
+$_rc_subr_loaded . /etc/rc.subr

 name="swap2"
 start_cmd="swap2_start"
--- a/etc/rc.d/sysctl
+++ b/etc/rc.d/sysctl
@ -1,13 +1,13 @@
 #!/bin/sh
 #
-# $NetBSD: sysctl,v 1.12 2002/04/29 12:10:23 lukem Exp $
+# $NetBSD: sysctl,v 1.13 2004/08/13 18:08:03 mycroft Exp $
 #

 # PROVIDE: sysctl
 # REQUIRE: root ipfilter ipsec
 # BEFORE:  DAEMON

-. /etc/rc.subr
+$_rc_subr_loaded . /etc/rc.subr

 name="sysctl"
 start_cmd="sysctl_start"
--- a/etc/rc.d/sysdb
+++ b/etc/rc.d/sysdb
@ -1,13 +1,13 @@
 #!/bin/sh
 #
-# $NetBSD: sysdb,v 1.13 2003/05/11 18:17:30 ragge Exp $
+# $NetBSD: sysdb,v 1.14 2004/08/13 18:08:03 mycroft Exp $
 #

 # PROVIDE: sysdb
 # REQUIRE: mountcritremote
 # BEFORE:  DAEMON

-. /etc/rc.subr
+$_rc_subr_loaded . /etc/rc.subr

 name="sysdb"
 start_cmd="sysdb_start"
--- a/etc/rc.d/syslogd
+++ b/etc/rc.d/syslogd
@ -1,13 +1,13 @@
 #!/bin/sh
 #
-# $NetBSD: syslogd,v 1.13 2002/06/18 14:35:39 lukem Exp $
+# $NetBSD: syslogd,v 1.14 2004/08/13 18:08:03 mycroft Exp $
 #

 # PROVIDE: syslogd
 # REQUIRE: mountcritremote sysdb wscons
 # BEFORE:  SERVERS

-. /etc/rc.subr
+$_rc_subr_loaded . /etc/rc.subr

 name="syslogd"
 rcvar=$name
--- a/etc/rc.d/timed
+++ b/etc/rc.d/timed
@ -1,13 +1,13 @@
 #!/bin/sh
 #
-# $NetBSD: timed,v 1.5 2002/03/22 04:34:00 thorpej Exp $
+# $NetBSD: timed,v 1.6 2004/08/13 18:08:03 mycroft Exp $
 #

 # PROVIDE: timed
 # REQUIRE: DAEMON
 # BEFORE:  LOGIN

-. /etc/rc.subr
+$_rc_subr_loaded . /etc/rc.subr

 name="timed"
 rcvar=$name
--- a/etc/rc.d/tpctl
+++ b/etc/rc.d/tpctl
@ -1,13 +1,13 @@
 #!/bin/sh
 #
-# $NetBSD: tpctl,v 1.1 2002/08/27 14:12:14 takemura Exp $
+# $NetBSD: tpctl,v 1.2 2004/08/13 18:08:03 mycroft Exp $
 #

 # PROVIDE: tpctl
 # REQUIRE: DAEMON wscons
 # BEFORE:  LOGIN

-. /etc/rc.subr
+$_rc_subr_loaded . /etc/rc.subr

 name="tpctl"
 rcvar=$name
--- a/etc/rc.d/ttys
+++ b/etc/rc.d/ttys
@ -1,12 +1,12 @@
 #!/bin/sh
 #
-# $NetBSD: ttys,v 1.4 2002/02/12 01:23:11 lukem Exp $
+# $NetBSD: ttys,v 1.5 2004/08/13 18:08:03 mycroft Exp $
 #

 # PROVIDE: tty
 # REQUIRE: root

-. /etc/rc.subr
+$_rc_subr_loaded . /etc/rc.subr

 name="ttyflags"
 start_cmd="ttyflags_start"
--- a/etc/rc.d/veriexec
+++ b/etc/rc.d/veriexec
@ -1,13 +1,13 @@
 #!/bin/sh
 #
-#	$NetBSD: veriexec,v 1.2 2004/01/15 11:20:19 uebayasi Exp $
+#	$NetBSD: veriexec,v 1.3 2004/08/13 18:08:03 mycroft Exp $
 #

 # PROVIDE: veriexec
 # REQUIRE: mountcritlocal
 # BEFORE:  securelevel

-. /etc/rc.subr
+$_rc_subr_loaded . /etc/rc.subr

 name="veriexec"
 rcvar=$name
--- a/etc/rc.d/virecover
+++ b/etc/rc.d/virecover
@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: virecover,v 1.7 2004/01/11 14:21:44 uebayasi Exp $
+# $NetBSD: virecover,v 1.8 2004/08/13 18:08:03 mycroft Exp $
 #

 # PROVIDE: virecover
@ -9,7 +9,7 @@
 #
 # XXX: should require `mail'!

-. /etc/rc.subr
+$_rc_subr_loaded . /etc/rc.subr

 name="virecover"
 rcvar=$name
--- a/etc/rc.d/wdogctl
+++ b/etc/rc.d/wdogctl
@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: wdogctl,v 1.1 2002/07/30 05:58:43 thorpej Exp $
+# $NetBSD: wdogctl,v 1.2 2004/08/13 18:08:03 mycroft Exp $
 #

 # BEFORE:  disks
@ -8,7 +8,7 @@
 # The watchdog is configured VERY early, so that any problems that
 # occur during the bootstrap process are protected by the watchdog.

-. /etc/rc.subr
+$_rc_subr_loaded . /etc/rc.subr

 name="wdogctl"
 rcvar=$name
--- a/etc/rc.d/wscons
+++ b/etc/rc.d/wscons
@ -1,13 +1,13 @@
 #!/bin/sh
 #
-# $NetBSD: wscons,v 1.9 2002/04/26 00:06:54 lukem Exp $
+# $NetBSD: wscons,v 1.10 2004/08/13 18:08:03 mycroft Exp $
 #

 # PROVIDE: wscons
 # REQUIRE: mountcritremote
 # BEFORE:  LOGIN

-. /etc/rc.subr
+$_rc_subr_loaded . /etc/rc.subr

 name="wscons"
 rcvar=$name
--- a/etc/rc.d/wsmoused
+++ b/etc/rc.d/wsmoused
@ -1,13 +1,13 @@
 #!/bin/sh
 #
-# $NetBSD: wsmoused,v 1.2 2003/03/04 22:32:11 jmmv Exp $
+# $NetBSD: wsmoused,v 1.3 2004/08/13 18:08:03 mycroft Exp $
 #

 # PROVIDE: wsmoused
 # REQUIRE: LOGIN
 # KEYWORD: shutdown

-. /etc/rc.subr
+$_rc_subr_loaded . /etc/rc.subr

 name="wsmoused"
 rcvar=$name
--- a/etc/rc.d/xdm
+++ b/etc/rc.d/xdm
@ -1,13 +1,13 @@
 #!/bin/sh
 #
-# $NetBSD: xdm,v 1.7 2004/05/17 23:41:27 lukem Exp $
+# $NetBSD: xdm,v 1.8 2004/08/13 18:08:03 mycroft Exp $
 #

 # PROVIDE: xdm
 # REQUIRE: DAEMON LOGIN wscons
 # KEYWORD: shutdown

-. /etc/rc.subr
+$_rc_subr_loaded . /etc/rc.subr

 name="xdm"
 rcvar=$name
--- a/etc/rc.d/xfs
+++ b/etc/rc.d/xfs
@ -1,13 +1,13 @@
 #!/bin/sh
 #
-# $NetBSD: xfs,v 1.7 2004/05/17 23:41:27 lukem Exp $
+# $NetBSD: xfs,v 1.8 2004/08/13 18:08:03 mycroft Exp $
 #

 # PROVIDE: xfs
 # REQUIRE: mountall cleartmp
 # BEFORE:  LOGIN

-. /etc/rc.subr
+$_rc_subr_loaded . /etc/rc.subr

 name="xfs"
 rcvar=$name
--- a/etc/rc.d/ypbind
+++ b/etc/rc.d/ypbind
@ -1,13 +1,13 @@
 #!/bin/sh
 #
-# $NetBSD: ypbind,v 1.5 2002/03/22 04:34:01 thorpej Exp $
+# $NetBSD: ypbind,v 1.6 2004/08/13 18:08:03 mycroft Exp $
 #

 # PROVIDE: ypbind
 # REQUIRE: ypserv
 # BEFORE:  DAEMON

-. /etc/rc.subr
+$_rc_subr_loaded . /etc/rc.subr

 name="ypbind"
 rcvar=$name
--- a/etc/rc.d/yppasswdd
+++ b/etc/rc.d/yppasswdd
@ -1,13 +1,13 @@
 #!/bin/sh
 #
-# $NetBSD: yppasswdd,v 1.6 2002/03/22 04:34:01 thorpej Exp $
+# $NetBSD: yppasswdd,v 1.7 2004/08/13 18:08:03 mycroft Exp $
 #

 # PROVIDE: yppasswdd
 # REQUIRE: ypserv ypbind
 # BEFORE:  LOGIN

-. /etc/rc.subr
+$_rc_subr_loaded . /etc/rc.subr

 name="yppasswdd"
 rcvar=$name
--- a/etc/rc.d/ypserv
+++ b/etc/rc.d/ypserv
@ -1,12 +1,12 @@
 #!/bin/sh
 #
-# $NetBSD: ypserv,v 1.5 2000/09/19 13:04:39 lukem Exp $
+# $NetBSD: ypserv,v 1.6 2004/08/13 18:08:03 mycroft Exp $
 #

 # PROVIDE: ypserv
 # REQUIRE: rpcbind

-. /etc/rc.subr
+$_rc_subr_loaded . /etc/rc.subr

 name="ypserv"
 rcvar=$name
--- a/etc/rc.subr
+++ b/etc/rc.subr
@ -1,4 +1,4 @@
-# $NetBSD: rc.subr,v 1.63 2004/05/03 14:52:26 lukem Exp $
+# $NetBSD: rc.subr,v 1.64 2004/08/13 18:08:03 mycroft Exp $
 #
 # Copyright (c) 1997-2002 The NetBSD Foundation, Inc.
 # All rights reserved.
@ -884,3 +884,5 @@ backup_file()
 		esac
 	fi
 }
+
+_rc_subr_loaded=: