[src/trunk]: src/etc/rc.d use extra_commands= instead of using 2nd argument t...

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

details:   https://anonhg.NetBSD.org/src/rev/d3ad61c3d256
branches:  trunk
changeset: 485530:d3ad61c3d256
user:      lukem <lukem%NetBSD.org@localhost>
date:      Sun Apr 30 13:23:04 2000 +0000

description:
use extra_commands= instead of using 2nd argument to run_rc_command

diffstat:

 etc/rc.d/inetd    |  5 +++--
 etc/rc.d/ipfilter |  5 +++--
 etc/rc.d/ipnat    |  6 ++++--
 etc/rc.d/kerberos |  8 +++++---
 etc/rc.d/mountd   |  5 +++--
 etc/rc.d/mrouted  |  5 +++--
 etc/rc.d/named    |  5 +++--
 etc/rc.d/rbootd   |  5 +++--
 etc/rc.d/syslogd  |  5 +++--
 etc/rc.d/xdm      |  5 +++--
 etc/rc.d/xfs      |  5 +++--
 11 files changed, 36 insertions(+), 23 deletions(-)

diffs (247 lines):

diff -r e2db2313cf3b -r d3ad61c3d256 etc/rc.d/inetd
--- a/etc/rc.d/inetd    Sun Apr 30 13:16:47 2000 +0000
+++ b/etc/rc.d/inetd    Sun Apr 30 13:23:04 2000 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: inetd,v 1.2 2000/03/13 04:03:57 lukem Exp $
+# $NetBSD: inetd,v 1.3 2000/04/30 13:23:32 lukem Exp $
 #
 
 # PROVIDE: inetd
@@ -13,5 +13,6 @@
 command="/usr/sbin/${name}"
 pidfile="/var/run/${name}.pid"
 required_files="/etc/${name}.conf"
+extra_commands="reload"
 
-run_rc_command "$1" "reload"
+run_rc_command "$1"
diff -r e2db2313cf3b -r d3ad61c3d256 etc/rc.d/ipfilter
--- a/etc/rc.d/ipfilter Sun Apr 30 13:16:47 2000 +0000
+++ b/etc/rc.d/ipfilter Sun Apr 30 13:23:04 2000 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: ipfilter,v 1.2 2000/03/11 20:10:21 veego Exp $
+# $NetBSD: ipfilter,v 1.3 2000/04/30 13:23:33 lukem Exp $
 #
 
 # PROVIDE: ipfilter
@@ -15,6 +15,7 @@
 stop_cmd="ipfilter_stop"
 reload_precmd="$stop_precmd"
 reload_cmd="ipfilter_reload"
+extra_commands="reload"
 
 ipfilter_start()
 {
@@ -49,4 +50,4 @@
        fi
 }
 
-run_rc_command "$1" "reload"
+run_rc_command "$1"
diff -r e2db2313cf3b -r d3ad61c3d256 etc/rc.d/ipnat
--- a/etc/rc.d/ipnat    Sun Apr 30 13:16:47 2000 +0000
+++ b/etc/rc.d/ipnat    Sun Apr 30 13:23:04 2000 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: ipnat,v 1.2 2000/03/12 03:49:36 thorpej Exp $
+# $NetBSD: ipnat,v 1.3 2000/04/30 13:23:33 lukem Exp $
 #
 
 # PROVIDE: ipnat
@@ -21,6 +21,8 @@
 reload_precmd=$start_precmd
 reload_cmd="/usr/sbin/ipnat -F -C -f ${config}"
 
+extra_commands="reload"
+
 ipnat_start()
 {
        if [ ! -f ${config} ]; then
@@ -34,4 +36,4 @@
        /usr/sbin/ipnat -F -f ${config}
 }
 
-run_rc_command "$1" "reload"
+run_rc_command "$1"
diff -r e2db2313cf3b -r d3ad61c3d256 etc/rc.d/kerberos
--- a/etc/rc.d/kerberos Sun Apr 30 13:16:47 2000 +0000
+++ b/etc/rc.d/kerberos Sun Apr 30 13:23:04 2000 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: kerberos,v 1.2 2000/03/13 04:03:57 lukem Exp $
+# $NetBSD: kerberos,v 1.3 2000/04/30 13:23:33 lukem Exp $
 #
 
 # PROVIDE: kerberos
@@ -9,11 +9,13 @@
 . /etc/rc.subr
 . /etc/rc.conf
 
+arg=$1
+
 name="kerberos"
 command="/usr/sbin/${name}"
 command_args=">> /var/log/${name}.log &"
 
-run_rc_command "$1"
+run_rc_command "$arg"
 
 
 name="kadmind"
@@ -21,4 +23,4 @@
 command="/usr/sbin/${name}"
 command_args="-n >> /var/log/${name}.log &"
 
-run_rc_command "$1"
+run_rc_command "$arg"
diff -r e2db2313cf3b -r d3ad61c3d256 etc/rc.d/mountd
--- a/etc/rc.d/mountd   Sun Apr 30 13:16:47 2000 +0000
+++ b/etc/rc.d/mountd   Sun Apr 30 13:23:04 2000 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: mountd,v 1.2 2000/03/11 17:29:50 veego Exp $
+# $NetBSD: mountd,v 1.3 2000/04/30 13:23:34 lukem Exp $
 #
 
 # PROVIDE: mountd
@@ -14,6 +14,7 @@
 command="/usr/sbin/${name}"
 required_files="/etc/exports"
 start_precmd="mountd_precmd"
+extra_commands="reload"
 
 mountd_precmd()
 {
@@ -22,4 +23,4 @@
        return 0
 }
 
-run_rc_command "$1" "reload"
+run_rc_command "$1"
diff -r e2db2313cf3b -r d3ad61c3d256 etc/rc.d/mrouted
--- a/etc/rc.d/mrouted  Sun Apr 30 13:16:47 2000 +0000
+++ b/etc/rc.d/mrouted  Sun Apr 30 13:23:04 2000 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: mrouted,v 1.2 2000/03/13 04:04:01 lukem Exp $
+# $NetBSD: mrouted,v 1.3 2000/04/30 13:23:34 lukem Exp $
 #
 
 # PROVIDE: mrouted
@@ -13,5 +13,6 @@
 command="/usr/sbin/${name}"
 pidfile="/var/run/${name}.pid"
 required_files="/etc/${name}.conf"
+extra_commands="reload"
 
-run_rc_command "$1" "reload"
+run_rc_command "$1"
diff -r e2db2313cf3b -r d3ad61c3d256 etc/rc.d/named
--- a/etc/rc.d/named    Sun Apr 30 13:16:47 2000 +0000
+++ b/etc/rc.d/named    Sun Apr 30 13:23:04 2000 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: named,v 1.2 2000/03/13 04:04:01 lukem Exp $
+# $NetBSD: named,v 1.3 2000/04/30 13:23:34 lukem Exp $
 #
 
 # PROVIDE: named
@@ -13,5 +13,6 @@
 command="/usr/sbin/${name}"
 command_flags="$1"
 pidfile="/var/run/${name}.pid"
+extra_commands="reload dumpdb notrace qrylog querylog stats trace"
 
-run_rc_command "$1" "reload dumpdb notrace qrylog querylog stats trace"
+run_rc_command "$1"
diff -r e2db2313cf3b -r d3ad61c3d256 etc/rc.d/rbootd
--- a/etc/rc.d/rbootd   Sun Apr 30 13:16:47 2000 +0000
+++ b/etc/rc.d/rbootd   Sun Apr 30 13:23:04 2000 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: rbootd,v 1.2 2000/03/13 04:04:02 lukem Exp $
+# $NetBSD: rbootd,v 1.3 2000/04/30 13:23:35 lukem Exp $
 #
 
 # PROVIDE: rbootd
@@ -13,5 +13,6 @@
 command="/usr/sbin/${name}"
 pidfile="/var/run/${name}.pid"
 required_files="/etc/${name}.conf"
+extra_commands="reload"
 
-run_rc_command "$1" "reload"
+run_rc_command "$1"
diff -r e2db2313cf3b -r d3ad61c3d256 etc/rc.d/syslogd
--- a/etc/rc.d/syslogd  Sun Apr 30 13:16:47 2000 +0000
+++ b/etc/rc.d/syslogd  Sun Apr 30 13:23:04 2000 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: syslogd,v 1.1.1.1 2000/03/10 11:53:24 lukem Exp $
+# $NetBSD: syslogd,v 1.2 2000/04/30 13:23:35 lukem Exp $
 #
 
 # PROVIDE: syslogd
@@ -14,6 +14,7 @@
 pidfile="/var/run/${name}.pid"
 required_files="/etc/syslog.conf"
 start_precmd="syslogd_precmd"
+extra_commands="reload"
 
 syslogd_precmd()
 {
@@ -26,4 +27,4 @@
        return 0
 }
 
-run_rc_command "$1" "reload"
+run_rc_command "$1"
diff -r e2db2313cf3b -r d3ad61c3d256 etc/rc.d/xdm
--- a/etc/rc.d/xdm      Sun Apr 30 13:16:47 2000 +0000
+++ b/etc/rc.d/xdm      Sun Apr 30 13:23:04 2000 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: xdm,v 1.2 2000/03/13 04:04:10 lukem Exp $
+# $NetBSD: xdm,v 1.3 2000/04/30 13:23:35 lukem Exp $
 #
 
 # PROVIDE: xdm
@@ -13,5 +13,6 @@
 command="/usr/X11R6/bin/${name}"
 pidfile="/var/run/${name}.pid"
 required_files="/usr/X11R6/lib/X11/xdm/xdm-config"
+extra_commands="reload"
 
-run_rc_command "$1" "reload"
+run_rc_command "$1"
diff -r e2db2313cf3b -r d3ad61c3d256 etc/rc.d/xfs
--- a/etc/rc.d/xfs      Sun Apr 30 13:16:47 2000 +0000
+++ b/etc/rc.d/xfs      Sun Apr 30 13:23:04 2000 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: xfs,v 1.1.1.1 2000/03/10 11:53:23 lukem Exp $
+# $NetBSD: xfs,v 1.2 2000/04/30 13:23:04 lukem Exp $
 #
 
 # PROVIDE: xfs
@@ -13,5 +13,6 @@
 command="/usr/X11R6/bin/${name}"
 command_args="& sleep 2"
 required_files="/usr/X11R6/lib/X11/fs/config"
+extra_commands="reload"
 
-run_rc_command "$1" "reload"
+run_rc_command "$1"