[src/netbsd-1-5]: src/etc/rc.d pull up rev 1.5 (approved by thorpej):

[lukem <lukem%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/29e94954674b
branches:  netbsd-1-5
changeset: 489621:29e94954674b
user:      lukem <lukem%NetBSD.org@localhost>
date:      Mon Oct 02 01:09:22 2000 +0000

description:
pull up rev 1.5 (approved by thorpej):
        - always use $rcvar to determine the name of the var to checkyesno
        - fix force*

diffstat:

 etc/rc.d/DAEMON     |   6 +++---
 etc/rc.d/bootparams |   3 ++-
 etc/rc.d/cron       |   3 ++-
 etc/rc.d/dmesg      |   4 ++--
 etc/rc.d/lkm1       |   7 ++++---
 etc/rc.d/lkm3       |   7 +++----
 etc/rc.d/motd       |   4 ++--
 etc/rc.d/mrouted    |   3 ++-
 etc/rc.d/postfix    |  11 +++--------
 etc/rc.d/rbootd     |   3 ++-
 etc/rc.d/routed     |   3 ++-
 etc/rc.d/rpcbind    |   3 ++-
 etc/rc.d/sysdb      |   4 ++--
 etc/rc.d/yppasswdd  |   5 +++--
 etc/rc.d/ypserv     |   7 ++++---
 15 files changed, 38 insertions(+), 35 deletions(-)

diffs (truncated from 348 to 300 lines):

diff -r 93bd175620bb -r 29e94954674b etc/rc.d/DAEMON
--- a/etc/rc.d/DAEMON   Mon Oct 02 01:08:52 2000 +0000
+++ b/etc/rc.d/DAEMON   Mon Oct 02 01:09:22 2000 +0000
@@ -1,12 +1,12 @@
 #!/bin/sh
 #
-# $NetBSD: DAEMON,v 1.2.2.2 2000/08/23 12:34:34 lukem Exp $
+# $NetBSD: DAEMON,v 1.2.2.3 2000/10/02 01:09:22 lukem Exp $
 #
 
 # PROVIDE: DAEMON
-# REQUIRE: accounting aftermountlkm amd cleartmp databases dmesg ipmon
+# REQUIRE: accounting aftermountlkm amd cleartmp dmesg ipmon
 # REQUIRE: ipnat ipsec ldconfig named network nonlocalswap nfslocking
-# REQUIRE: pwcheck quota savecore securelevel sysctl virecover ypbind
+# REQUIRE: pwcheck quota savecore securelevel sysctl sysdb virecover ypbind
 
 #      This is a dummy dependancy, to ensure that general purpose daemons
 #      are run _after_ the above are.
diff -r 93bd175620bb -r 29e94954674b etc/rc.d/bootparams
--- a/etc/rc.d/bootparams       Mon Oct 02 01:08:52 2000 +0000
+++ b/etc/rc.d/bootparams       Mon Oct 02 01:09:22 2000 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: bootparams,v 1.4 2000/06/02 22:54:11 fvdl Exp $
+# $NetBSD: bootparams,v 1.4.2.1 2000/10/02 01:09:23 lukem Exp $
 #
 
 # PROVIDE: bootparams
@@ -9,6 +9,7 @@
 . /etc/rc.subr
 
 name="bootparamd"
+rcvar=$name
 command="/usr/sbin/rpc.${name}"
 required_files="/etc/bootparams"
 
diff -r 93bd175620bb -r 29e94954674b etc/rc.d/cron
--- a/etc/rc.d/cron     Mon Oct 02 01:08:52 2000 +0000
+++ b/etc/rc.d/cron     Mon Oct 02 01:09:22 2000 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: cron,v 1.3.4.1 2000/08/09 19:09:39 lukem Exp $
+# $NetBSD: cron,v 1.3.4.2 2000/10/02 01:09:23 lukem Exp $
 #
 
 # PROVIDE: cron
@@ -10,6 +10,7 @@
 . /etc/rc.subr
 
 name="cron"
+rcvar=$name
 command="/usr/sbin/${name}"
 pidfile="/var/run/${name}.pid"
 
diff -r 93bd175620bb -r 29e94954674b etc/rc.d/dmesg
--- a/etc/rc.d/dmesg    Mon Oct 02 01:08:52 2000 +0000
+++ b/etc/rc.d/dmesg    Mon Oct 02 01:09:22 2000 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: dmesg,v 1.3.4.1 2000/08/09 19:09:39 lukem Exp $
+# $NetBSD: dmesg,v 1.3.4.2 2000/10/02 01:09:23 lukem Exp $
 #
 
 # PROVIDE: dmesg
@@ -9,7 +9,7 @@
 . /etc/rc.subr
 
 name="dmesg"
-start_precmd="checkyesno dmesg"
+rcvar=$name
 start_cmd="do_dmesg"
 stop_cmd=":"
 
diff -r 93bd175620bb -r 29e94954674b etc/rc.d/lkm1
--- a/etc/rc.d/lkm1     Mon Oct 02 01:08:52 2000 +0000
+++ b/etc/rc.d/lkm1     Mon Oct 02 01:09:22 2000 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: lkm1,v 1.2.4.2 2000/08/23 12:24:40 lukem Exp $
+# $NetBSD: lkm1,v 1.2.4.3 2000/10/02 01:09:24 lukem Exp $
 #
 
 # PROVIDE: beforenetlkm
@@ -9,6 +9,7 @@
 . /etc/rc.subr
 
 name="lkm1"
+rcvar="lkm"
 start_cmd="lkm1_start"
 stop_cmd="lkm1_stop"
 
@@ -17,7 +18,7 @@
 #              load kernel modules specified in /etc/lkm.conf if the /usr
 #              filesystem is already present with "/" or can be mounted now
 #
-       if checkyesno lkm && [ -f /etc/rc.lkm ]; then
+       if [ -f /etc/rc.lkm ]; then
                mount /usr >/dev/null 2>&1
                if [ -x /usr/bin/ld ]; then
                        lkmstage=BEFORENET
@@ -28,7 +29,7 @@
 
 lkm1_stop()
 {
-       if checkyesno lkm && [ -f /etc/rc.lkm -a -x /usr/bin/ld ]; then
+       if [ -f /etc/rc.lkm -a -x /usr/bin/ld ]; then
                lkmstage=BEFORENET
                set stop ; . /etc/rc.lkm
        fi
diff -r 93bd175620bb -r 29e94954674b etc/rc.d/lkm3
--- a/etc/rc.d/lkm3     Mon Oct 02 01:08:52 2000 +0000
+++ b/etc/rc.d/lkm3     Mon Oct 02 01:09:22 2000 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: lkm3,v 1.3.4.1 2000/08/09 19:09:41 lukem Exp $
+# $NetBSD: lkm3,v 1.3.4.2 2000/10/02 01:09:24 lukem Exp $
 #
 
 # PROVIDE: aftermountlkm
@@ -9,16 +9,15 @@
 . /etc/rc.subr
 
 name="lkm3"
-start_precmd="checkyesno lkm"
+rcvar="lkm"
 start_cmd="do_lkm3 start"
-stop_precmd="$start_precmd"
 stop_cmd="do_lkm3 stop"
 
 do_lkm3()
 {
        #       (un)load kernel modules specified in /etc/lkm.conf
        #
-       if checkyesno lkm && [ -f /etc/rc.lkm ]; then
+       if [ -f /etc/rc.lkm ]; then
                lkmstage=AFTERMOUNT
                set $1 ; . /etc/rc.lkm
        fi
diff -r 93bd175620bb -r 29e94954674b etc/rc.d/motd
--- a/etc/rc.d/motd     Mon Oct 02 01:08:52 2000 +0000
+++ b/etc/rc.d/motd     Mon Oct 02 01:09:22 2000 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: motd,v 1.2.4.2 2000/08/09 19:09:41 lukem Exp $
+# $NetBSD: motd,v 1.2.4.3 2000/10/02 01:09:24 lukem Exp $
 #
 
 # PROVIDE: motd
@@ -9,7 +9,7 @@
 . /etc/rc.subr
 
 name="motd"
-start_precmd="checkyesno update_motd"
+rcvar="update_motd"
 start_cmd="motd_start"
 stop_cmd=":"
 
diff -r 93bd175620bb -r 29e94954674b etc/rc.d/mrouted
--- a/etc/rc.d/mrouted  Mon Oct 02 01:08:52 2000 +0000
+++ b/etc/rc.d/mrouted  Mon Oct 02 01:09:22 2000 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: mrouted,v 1.4 2000/05/13 08:45:07 lukem Exp $
+# $NetBSD: mrouted,v 1.4.4.1 2000/10/02 01:09:25 lukem Exp $
 #
 
 # PROVIDE: mrouted
@@ -9,6 +9,7 @@
 . /etc/rc.subr
 
 name="mrouted"
+rcvar=$name
 command="/usr/sbin/${name}"
 pidfile="/var/run/${name}.pid"
 required_files="/etc/${name}.conf"
diff -r 93bd175620bb -r 29e94954674b etc/rc.d/postfix
--- a/etc/rc.d/postfix  Mon Oct 02 01:08:52 2000 +0000
+++ b/etc/rc.d/postfix  Mon Oct 02 01:09:22 2000 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: postfix,v 1.4 2000/05/13 08:45:08 lukem Exp $
+# $NetBSD: postfix,v 1.4.4.1 2000/10/02 01:09:25 lukem Exp $
 #
 
 # PROVIDE: mail
@@ -13,17 +13,12 @@
 . /etc/rc.subr
 
 name="postfix"
+rcvar=$name
 required_files="/etc/${name}/main.cf"
-extra_commands="reload"
-
-start_precmd="checkyesno postfix"
 start_cmd="postfix start"
-
-stop_precmd=$start_precmd
 stop_cmd="postfix stop"
-
-reload_precmd=$start_precmd
 reload_cmd="postfix reload"
+extra_commands="reload"
 
 load_rc_config $name
 run_rc_command "$1"
diff -r 93bd175620bb -r 29e94954674b etc/rc.d/rbootd
--- a/etc/rc.d/rbootd   Mon Oct 02 01:08:52 2000 +0000
+++ b/etc/rc.d/rbootd   Mon Oct 02 01:09:22 2000 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: rbootd,v 1.4 2000/05/13 08:45:09 lukem Exp $
+# $NetBSD: rbootd,v 1.4.4.1 2000/10/02 01:09:25 lukem Exp $
 #
 
 # PROVIDE: rbootd
@@ -9,6 +9,7 @@
 . /etc/rc.subr
 
 name="rbootd"
+rcvar=$name
 command="/usr/sbin/${name}"
 pidfile="/var/run/${name}.pid"
 required_files="/etc/${name}.conf"
diff -r 93bd175620bb -r 29e94954674b etc/rc.d/routed
--- a/etc/rc.d/routed   Mon Oct 02 01:08:52 2000 +0000
+++ b/etc/rc.d/routed   Mon Oct 02 01:09:22 2000 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: routed,v 1.4 2000/05/13 08:45:09 lukem Exp $
+# $NetBSD: routed,v 1.4.4.1 2000/10/02 01:09:26 lukem Exp $
 #
 
 # PROVIDE: routed
@@ -9,6 +9,7 @@
 . /etc/rc.subr
 
 name="routed"
+rcvar=$name
 command="/sbin/${name}"
 start_precmd="routed_precmd"
 
diff -r 93bd175620bb -r 29e94954674b etc/rc.d/rpcbind
--- a/etc/rc.d/rpcbind  Mon Oct 02 01:08:52 2000 +0000
+++ b/etc/rc.d/rpcbind  Mon Oct 02 01:09:22 2000 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: rpcbind,v 1.3.2.1 2000/08/09 19:09:45 lukem Exp $
+# $NetBSD: rpcbind,v 1.3.2.2 2000/10/02 01:09:26 lukem Exp $
 #
 
 # PROVIDE: rpcbind
@@ -9,6 +9,7 @@
 . /etc/rc.subr
 
 name="rpcbind"
+rcvar=$name
 command="/usr/sbin/${name}"
 pidfile="/var/run/${name}.pid"
 
diff -r 93bd175620bb -r 29e94954674b etc/rc.d/sysdb
--- a/etc/rc.d/sysdb    Mon Oct 02 01:08:52 2000 +0000
+++ b/etc/rc.d/sysdb    Mon Oct 02 01:09:22 2000 +0000
@@ -1,9 +1,9 @@
 #!/bin/sh
 #
-# $NetBSD: sysdb,v 1.2.4.1 2000/08/09 19:09:48 lukem Exp $
+# $NetBSD: sysdb,v 1.2.4.2 2000/10/02 01:09:27 lukem Exp $
 #
 
-# PROVIDE: databases
+# PROVIDE: sysdb
 # REQUIRE: mountcritremote
 
 . /etc/rc.subr
diff -r 93bd175620bb -r 29e94954674b etc/rc.d/yppasswdd
--- a/etc/rc.d/yppasswdd        Mon Oct 02 01:08:52 2000 +0000
+++ b/etc/rc.d/yppasswdd        Mon Oct 02 01:09:22 2000 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: yppasswdd,v 1.4 2000/06/02 22:54:13 fvdl Exp $
+# $NetBSD: yppasswdd,v 1.4.2.1 2000/10/02 01:09:27 lukem Exp $
 #
 
 # PROVIDE: yppasswdd
@@ -9,6 +9,7 @@
 . /etc/rc.subr