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

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

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

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

diffstat:

 etc/rc.d/amd     |   3 ++-
 etc/rc.d/inetd   |   3 ++-
 etc/rc.d/ipnat   |  10 ++--------
 etc/rc.d/ipsec   |   9 +++------
 etc/rc.d/named   |   3 ++-
 etc/rc.d/ntpdate |   4 ++--
 etc/rc.d/wscons  |   4 ++--
 etc/rc.d/xdm     |   3 ++-
 8 files changed, 17 insertions(+), 22 deletions(-)

diffs (179 lines):

diff -r 29e94954674b -r ac6ed9d23c15 etc/rc.d/amd
--- a/etc/rc.d/amd      Mon Oct 02 01:09:22 2000 +0000
+++ b/etc/rc.d/amd      Mon Oct 02 01:09:49 2000 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: amd,v 1.5 2000/06/02 22:54:11 fvdl Exp $
+# $NetBSD: amd,v 1.5.2.1 2000/10/02 01:09:49 lukem Exp $
 #
 
 # PROVIDE: amd
@@ -9,6 +9,7 @@
 . /etc/rc.subr
 
 name="amd"
+rcvar=$name
 command="/usr/sbin/${name}"
 load_rc_config $name
 
diff -r 29e94954674b -r ac6ed9d23c15 etc/rc.d/inetd
--- a/etc/rc.d/inetd    Mon Oct 02 01:09:22 2000 +0000
+++ b/etc/rc.d/inetd    Mon Oct 02 01:09:49 2000 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: inetd,v 1.4.4.1 2000/08/09 19:09:40 lukem Exp $
+# $NetBSD: inetd,v 1.4.4.2 2000/10/02 01:09:50 lukem Exp $
 #
 
 # PROVIDE: inetd
@@ -10,6 +10,7 @@
 . /etc/rc.subr
 
 name="inetd"
+rcvar=$name
 command="/usr/sbin/${name}"
 pidfile="/var/run/${name}.pid"
 required_files="/etc/${name}.conf"
diff -r 29e94954674b -r ac6ed9d23c15 etc/rc.d/ipnat
--- a/etc/rc.d/ipnat    Mon Oct 02 01:09:22 2000 +0000
+++ b/etc/rc.d/ipnat    Mon Oct 02 01:09:49 2000 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: ipnat,v 1.4.4.1 2000/08/23 12:13:14 lukem Exp $
+# $NetBSD: ipnat,v 1.4.4.2 2000/10/02 01:09:50 lukem Exp $
 #
 
 # PROVIDE: ipnat
@@ -9,17 +9,11 @@
 . /etc/rc.subr
 
 name="ipnat"
+rcvar=$name
 config="/etc/ipnat.conf"
-
-start_precmd="checkyesno ipnat"
 start_cmd="ipnat_start"
-
-stop_precmd=$start_precmd
 stop_cmd="/usr/sbin/ipnat -F -C"
-
-reload_precmd=$start_precmd
 reload_cmd="/usr/sbin/ipnat -F -C -f ${config}"
-
 extra_commands="reload"
 
 ipnat_start()
diff -r 29e94954674b -r ac6ed9d23c15 etc/rc.d/ipsec
--- a/etc/rc.d/ipsec    Mon Oct 02 01:09:22 2000 +0000
+++ b/etc/rc.d/ipsec    Mon Oct 02 01:09:49 2000 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: ipsec,v 1.3.2.1 2000/08/09 18:47:13 lukem Exp $
+# $NetBSD: ipsec,v 1.3.2.2 2000/10/02 01:09:50 lukem Exp $
 #
 
 # PROVIDE: ipsec
@@ -11,19 +11,16 @@
 . /etc/rc.subr
 
 name="ipsec"
+rcvar=$name
 start_precmd="ipsec_prestart"
 start_cmd="ipsec_start"
-stop_precmd="checkyesno ipsec && [ -f /etc/ipsec.conf ]"
+stop_precmd="test -f /etc/ipsec.conf"
 stop_cmd="ipsec_stop"
-reload_precmd="$stop_precmd"
 reload_cmd="ipsec_reload"
 extra_commands="reload"
 
 ipsec_prestart()
 {
-       if ! checkyesno ipsec; then
-               return 1
-       fi
        if [ ! -f /etc/ipsec.conf ]; then
                warn "/etc/ipsec.conf not readable; ipsec start aborted."
                        #
diff -r 29e94954674b -r ac6ed9d23c15 etc/rc.d/named
--- a/etc/rc.d/named    Mon Oct 02 01:09:22 2000 +0000
+++ b/etc/rc.d/named    Mon Oct 02 01:09:49 2000 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: named,v 1.5 2000/05/13 08:45:07 lukem Exp $
+# $NetBSD: named,v 1.5.4.1 2000/10/02 01:09:51 lukem Exp $
 #
 
 # PROVIDE: named
@@ -9,6 +9,7 @@
 . /etc/rc.subr
 
 name="named"
+rcvar=$name
 command="/usr/sbin/${name}"
 pidfile="/var/run/${name}.pid"
 
diff -r 29e94954674b -r ac6ed9d23c15 etc/rc.d/ntpdate
--- a/etc/rc.d/ntpdate  Mon Oct 02 01:09:22 2000 +0000
+++ b/etc/rc.d/ntpdate  Mon Oct 02 01:09:49 2000 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: ntpdate,v 1.3.4.2 2000/08/21 15:02:50 abs Exp $
+# $NetBSD: ntpdate,v 1.3.4.3 2000/10/02 01:09:51 lukem Exp $
 #
 
 # PROVIDE: ntpdate
@@ -9,7 +9,7 @@
 . /etc/rc.subr
 
 name="ntpdate"
-start_precmd="checkyesno ntpdate"
+rcvar=$name
 start_cmd="ntpdate_start"
 stop_cmd=":"
 
diff -r 29e94954674b -r ac6ed9d23c15 etc/rc.d/wscons
--- a/etc/rc.d/wscons   Mon Oct 02 01:09:22 2000 +0000
+++ b/etc/rc.d/wscons   Mon Oct 02 01:09:49 2000 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: wscons,v 1.3.4.2 2000/08/24 09:26:12 tron Exp $
+# $NetBSD: wscons,v 1.3.4.3 2000/10/02 01:09:51 lukem Exp $
 #
 
 # PROVIDE: wscons
@@ -9,7 +9,7 @@
 . /etc/rc.subr
 
 name="wscons"
-start_precmd="checkyesno wscons"
+rcvar=$name
 start_cmd="wscons_start"
 stop_cmd=":"
 
diff -r 29e94954674b -r ac6ed9d23c15 etc/rc.d/xdm
--- a/etc/rc.d/xdm      Mon Oct 02 01:09:22 2000 +0000
+++ b/etc/rc.d/xdm      Mon Oct 02 01:09:49 2000 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: xdm,v 1.4.4.1 2000/08/09 19:09:50 lukem Exp $
+# $NetBSD: xdm,v 1.4.4.2 2000/10/02 01:09:52 lukem Exp $
 #
 
 # PROVIDE: xdm
@@ -10,6 +10,7 @@
 . /etc/rc.subr
 
 name="xdm"
+rcvar=$name
 command="/usr/X11R6/bin/${name}"
 pidfile="/var/run/${name}.pid"
 required_files="/usr/X11R6/lib/X11/xdm/xdm-config"