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

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

details:   https://anonhg.NetBSD.org/src/rev/93bd175620bb
branches:  netbsd-1-5
changeset: 489620:93bd175620bb
user:      lukem <lukem%NetBSD.org@localhost>
date:      Mon Oct 02 01:08:52 2000 +0000

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

diffstat:

 etc/rc.d/apmd        |  3 ++-
 etc/rc.d/dhcpd       |  3 ++-
 etc/rc.d/dhcrelay    |  3 ++-
 etc/rc.d/gated       |  3 ++-
 etc/rc.d/lkm2        |  5 ++---
 etc/rc.d/lpd         |  3 ++-
 etc/rc.d/mopd        |  3 ++-
 etc/rc.d/nfslocking  |  4 +++-
 etc/rc.d/rarpd       |  3 ++-
 etc/rc.d/route6d     |  3 ++-
 etc/rc.d/rtadvd      |  3 ++-
 etc/rc.d/rtsold      |  3 ++-
 etc/rc.d/rwho        |  3 ++-
 etc/rc.d/screenblank |  3 ++-
 etc/rc.d/timed       |  3 ++-
 etc/rc.d/xfs         |  3 ++-
 etc/rc.d/ypbind      |  5 +++--
 17 files changed, 36 insertions(+), 20 deletions(-)

diffs (truncated from 341 to 300 lines):

diff -r db49a4ba84ae -r 93bd175620bb etc/rc.d/apmd
--- a/etc/rc.d/apmd     Mon Oct 02 01:07:16 2000 +0000
+++ b/etc/rc.d/apmd     Mon Oct 02 01:08:52 2000 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: apmd,v 1.3 2000/05/13 08:45:06 lukem Exp $
+# $NetBSD: apmd,v 1.3.4.1 2000/10/02 01:08:52 lukem Exp $
 #
 
 # PROVIDE: apmd
@@ -9,6 +9,7 @@
 . /etc/rc.subr
 
 name="apmd"
+rcvar=$name
 command="/usr/sbin/${name}"
 
 load_rc_config $name
diff -r db49a4ba84ae -r 93bd175620bb etc/rc.d/dhcpd
--- a/etc/rc.d/dhcpd    Mon Oct 02 01:07:16 2000 +0000
+++ b/etc/rc.d/dhcpd    Mon Oct 02 01:08:52 2000 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: dhcpd,v 1.3 2000/05/13 08:45:06 lukem Exp $
+# $NetBSD: dhcpd,v 1.3.4.1 2000/10/02 01:08:53 lukem Exp $
 #
 
 # PROVIDE: dhcpd
@@ -9,6 +9,7 @@
 . /etc/rc.subr
 
 name="dhcpd"
+rcvar=$name
 command="/usr/sbin/${name}"
 pidfile="/var/run/${name}.pid"
 required_files="/etc/${name}.conf /var/db/${name}.leases"
diff -r db49a4ba84ae -r 93bd175620bb etc/rc.d/dhcrelay
--- a/etc/rc.d/dhcrelay Mon Oct 02 01:07:16 2000 +0000
+++ b/etc/rc.d/dhcrelay Mon Oct 02 01:08:52 2000 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: dhcrelay,v 1.3 2000/05/13 08:45:06 lukem Exp $
+# $NetBSD: dhcrelay,v 1.3.4.1 2000/10/02 01:08:53 lukem Exp $
 #
 
 # PROVIDE: dhcrelay
@@ -9,6 +9,7 @@
 . /etc/rc.subr
 
 name="dhcrelay"
+rcvar=$name
 command="/usr/sbin/${name}"
 pidfile="/var/run/${name}.pid"
 
diff -r db49a4ba84ae -r 93bd175620bb etc/rc.d/gated
--- a/etc/rc.d/gated    Mon Oct 02 01:07:16 2000 +0000
+++ b/etc/rc.d/gated    Mon Oct 02 01:08:52 2000 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: gated,v 1.3 2000/05/13 08:45:06 lukem Exp $
+# $NetBSD: gated,v 1.3.4.1 2000/10/02 01:08:54 lukem Exp $
 #
 
 # PROVIDE: gated
@@ -9,6 +9,7 @@
 . /etc/rc.subr
 
 name="gated"
+rcvar=$name
 command="/usr/sbin/${name}"
 pidfile="/var/run/${name}.pid"
 required_files="/etc/${name}.conf"
diff -r db49a4ba84ae -r 93bd175620bb etc/rc.d/lkm2
--- a/etc/rc.d/lkm2     Mon Oct 02 01:07:16 2000 +0000
+++ b/etc/rc.d/lkm2     Mon Oct 02 01:08:52 2000 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: lkm2,v 1.2.4.1 2000/08/09 19:09:41 lukem Exp $
+# $NetBSD: lkm2,v 1.2.4.2 2000/10/02 01:08:54 lukem Exp $
 #
 
 # PROVIDE: beforemountlkm
@@ -9,9 +9,8 @@
 . /etc/rc.subr
 
 name="lkm2"
-start_precmd="checkyesno lkm"
+rcvar="lkm"
 start_cmd="lkm2_start"
-stop_precmd="$start_precmd"
 stop_cmd="lkm2_stop"
 
 #              load kernel modules specified in /etc/lkm.conf
diff -r db49a4ba84ae -r 93bd175620bb etc/rc.d/lpd
--- a/etc/rc.d/lpd      Mon Oct 02 01:07:16 2000 +0000
+++ b/etc/rc.d/lpd      Mon Oct 02 01:08:52 2000 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: lpd,v 1.3 2000/05/13 08:45:07 lukem Exp $
+# $NetBSD: lpd,v 1.3.4.1 2000/10/02 01:08:55 lukem Exp $
 #
 
 # PROVIDE: lpd
@@ -9,6 +9,7 @@
 . /etc/rc.subr
 
 name="lpd"
+rcvar=$name
 command="/usr/sbin/${name}"
 pidfile="/var/run/${name}.pid"
 required_files="/etc/printcap"
diff -r db49a4ba84ae -r 93bd175620bb etc/rc.d/mopd
--- a/etc/rc.d/mopd     Mon Oct 02 01:07:16 2000 +0000
+++ b/etc/rc.d/mopd     Mon Oct 02 01:08:52 2000 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: mopd,v 1.3 2000/05/13 08:45:07 lukem Exp $
+# $NetBSD: mopd,v 1.3.4.1 2000/10/02 01:08:55 lukem Exp $
 #
 
 # PROVIDE: mopd
@@ -9,6 +9,7 @@
 . /etc/rc.subr
 
 name="mopd"
+rcvar=$name
 command="/usr/sbin/${name}"
 
 load_rc_config $name
diff -r db49a4ba84ae -r 93bd175620bb etc/rc.d/nfslocking
--- a/etc/rc.d/nfslocking       Mon Oct 02 01:07:16 2000 +0000
+++ b/etc/rc.d/nfslocking       Mon Oct 02 01:08:52 2000 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: nfslocking,v 1.3 2000/05/13 08:45:07 lukem Exp $
+# $NetBSD: nfslocking,v 1.3.4.1 2000/10/02 01:08:55 lukem Exp $
 #
 
 # PROVIDE: nfslocking
@@ -15,11 +15,13 @@
 status_precmd=$start_precmd
 
 name="statd"
+rcvar=$name
 command="/usr/sbin/rpc.${name}"
 load_rc_config $name
 run_rc_command "$arg"
 
 name="lockd"
+rcvar=$name
 command="/usr/sbin/rpc.${name}"
 load_rc_config $name
 run_rc_command "$arg"
diff -r db49a4ba84ae -r 93bd175620bb etc/rc.d/rarpd
--- a/etc/rc.d/rarpd    Mon Oct 02 01:07:16 2000 +0000
+++ b/etc/rc.d/rarpd    Mon Oct 02 01:08:52 2000 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: rarpd,v 1.3 2000/05/13 08:45:09 lukem Exp $
+# $NetBSD: rarpd,v 1.3.4.1 2000/10/02 01:08:56 lukem Exp $
 #
 
 # PROVIDE: rarpd
@@ -9,6 +9,7 @@
 . /etc/rc.subr
 
 name="rarpd"
+rcvar=$name
 command="/usr/sbin/${name}"
 pidfile="/var/run/${name}.pid"
 required_files="/etc/ethers"
diff -r db49a4ba84ae -r 93bd175620bb etc/rc.d/route6d
--- a/etc/rc.d/route6d  Mon Oct 02 01:07:16 2000 +0000
+++ b/etc/rc.d/route6d  Mon Oct 02 01:08:52 2000 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: route6d,v 1.3 2000/05/13 08:45:09 lukem Exp $
+# $NetBSD: route6d,v 1.3.4.1 2000/10/02 01:08:56 lukem Exp $
 #
 
 # PROVIDE: route6d
@@ -9,6 +9,7 @@
 . /etc/rc.subr
 
 name="route6d"
+rcvar=$name
 command="/usr/sbin/${name}"
 
 load_rc_config $name
diff -r db49a4ba84ae -r 93bd175620bb etc/rc.d/rtadvd
--- a/etc/rc.d/rtadvd   Mon Oct 02 01:07:16 2000 +0000
+++ b/etc/rc.d/rtadvd   Mon Oct 02 01:08:52 2000 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: rtadvd,v 1.3 2000/05/13 08:45:09 lukem Exp $
+# $NetBSD: rtadvd,v 1.3.4.1 2000/10/02 01:08:56 lukem Exp $
 #
 
 # PROVIDE: rtadvd
@@ -9,6 +9,7 @@
 . /etc/rc.subr
 
 name="rtadvd"
+rcvar=$name
 command="/usr/sbin/${name}"
 start_precmd="rtadvd_precmd"
 
diff -r db49a4ba84ae -r 93bd175620bb etc/rc.d/rtsold
--- a/etc/rc.d/rtsold   Mon Oct 02 01:07:16 2000 +0000
+++ b/etc/rc.d/rtsold   Mon Oct 02 01:08:52 2000 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: rtsold,v 1.3 2000/05/13 08:45:09 lukem Exp $
+# $NetBSD: rtsold,v 1.3.4.1 2000/10/02 01:08:57 lukem Exp $
 #
 
 # PROVIDE: rtsold
@@ -9,6 +9,7 @@
 . /etc/rc.subr
 
 name="rtsold"
+rcvar=$name
 command="/usr/sbin/${name}"
 start_precmd="rtsold_precmd"
 
diff -r db49a4ba84ae -r 93bd175620bb etc/rc.d/rwho
--- a/etc/rc.d/rwho     Mon Oct 02 01:07:16 2000 +0000
+++ b/etc/rc.d/rwho     Mon Oct 02 01:08:52 2000 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: rwho,v 1.3 2000/05/13 08:45:09 lukem Exp $
+# $NetBSD: rwho,v 1.3.4.1 2000/10/02 01:08:57 lukem Exp $
 #
 
 # PROVIDE: rwho
@@ -9,6 +9,7 @@
 . /etc/rc.subr
 
 name="rwhod"
+rcvar=$name
 command="/usr/sbin/${name}"
 
 load_rc_config $name
diff -r db49a4ba84ae -r 93bd175620bb etc/rc.d/screenblank
--- a/etc/rc.d/screenblank      Mon Oct 02 01:07:16 2000 +0000
+++ b/etc/rc.d/screenblank      Mon Oct 02 01:08:52 2000 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: screenblank,v 1.3 2000/05/13 08:45:09 lukem Exp $
+# $NetBSD: screenblank,v 1.3.4.1 2000/10/02 01:08:57 lukem Exp $
 #
 
 # PROVIDE: screenblank
@@ -9,6 +9,7 @@
 . /etc/rc.subr
 
 name="screenblank"
+rcvar=$name
 command="/usr/sbin/${name}"
 pidfile="/var/run/${name}.pid"
 
diff -r db49a4ba84ae -r 93bd175620bb etc/rc.d/timed
--- a/etc/rc.d/timed    Mon Oct 02 01:07:16 2000 +0000
+++ b/etc/rc.d/timed    Mon Oct 02 01:08:52 2000 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: timed,v 1.3 2000/05/13 08:45:09 lukem Exp $
+# $NetBSD: timed,v 1.3.4.1 2000/10/02 01:08:58 lukem Exp $
 #
 
 # PROVIDE: timed
@@ -9,6 +9,7 @@
 . /etc/rc.subr
 
 name="timed"
+rcvar=$name
 command="/usr/sbin/${name}"
 
 load_rc_config $name
diff -r db49a4ba84ae -r 93bd175620bb etc/rc.d/xfs
--- a/etc/rc.d/xfs      Mon Oct 02 01:07:16 2000 +0000
+++ b/etc/rc.d/xfs      Mon Oct 02 01:08:52 2000 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #