Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/etc/rc.d Use load_rc_config() (from rc.subr) instead of sour...
details: https://anonhg.NetBSD.org/src/rev/7971cfdcfeb4
branches: trunk
changeset: 486107:7971cfdcfeb4
user: lukem <lukem%NetBSD.org@localhost>
date: Sat May 13 08:45:06 2000 +0000
description:
Use load_rc_config() (from rc.subr) instead of sourcing /etc/rc.conf.
This allows us or a user to change the configuration file method in
one place - rc.subr - without having to edit all of the rc.d/* files.
diffstat:
etc/rc.d/accounting | 4 ++--
etc/rc.d/amd | 4 ++--
etc/rc.d/apmd | 4 ++--
etc/rc.d/bootparams | 4 ++--
etc/rc.d/ccd | 4 ++--
etc/rc.d/cleartmp | 4 ++--
etc/rc.d/cron | 4 ++--
etc/rc.d/dhclient | 4 ++--
etc/rc.d/dhcpd | 4 ++--
etc/rc.d/dhcrelay | 4 ++--
etc/rc.d/dmesg | 4 ++--
etc/rc.d/gated | 4 ++--
etc/rc.d/inetd | 4 ++--
etc/rc.d/ipfilter | 4 ++--
etc/rc.d/ipmon | 4 ++--
etc/rc.d/ipnat | 4 ++--
etc/rc.d/kerberos | 5 +++--
etc/rc.d/ldconfig | 4 ++--
etc/rc.d/lkm1 | 4 ++--
etc/rc.d/lkm2 | 4 ++--
etc/rc.d/lkm3 | 4 ++--
etc/rc.d/local | 4 ++--
etc/rc.d/lpd | 4 ++--
etc/rc.d/mopd | 4 ++--
etc/rc.d/motd | 4 ++--
etc/rc.d/mountall | 4 ++--
etc/rc.d/mountcritlocal | 4 ++--
etc/rc.d/mountcritremote | 4 ++--
etc/rc.d/mountd | 4 ++--
etc/rc.d/mrouted | 4 ++--
etc/rc.d/named | 4 ++--
etc/rc.d/network | 4 ++--
etc/rc.d/nfsd | 4 ++--
etc/rc.d/nfslocking | 5 +++--
etc/rc.d/ntpd | 4 ++--
etc/rc.d/ntpdate | 4 ++--
etc/rc.d/portmap | 4 ++--
etc/rc.d/postfix | 4 ++--
etc/rc.d/ppp | 4 ++--
etc/rc.d/pwcheck | 4 ++--
etc/rc.d/quota | 4 ++--
etc/rc.d/raidframe | 4 ++--
etc/rc.d/rarpd | 4 ++--
etc/rc.d/rbootd | 4 ++--
etc/rc.d/root | 4 ++--
etc/rc.d/route6d | 4 ++--
etc/rc.d/routed | 4 ++--
etc/rc.d/rtadvd | 4 ++--
etc/rc.d/rtsold | 4 ++--
etc/rc.d/rwho | 4 ++--
etc/rc.d/savecore | 4 ++--
etc/rc.d/screenblank | 4 ++--
etc/rc.d/sendmail | 4 ++--
etc/rc.d/swap1 | 4 ++--
etc/rc.d/swap2 | 4 ++--
etc/rc.d/sysctl | 4 ++--
etc/rc.d/sysdb | 4 ++--
etc/rc.d/syslogd | 4 ++--
etc/rc.d/systemfs | 4 ++--
etc/rc.d/timed | 4 ++--
etc/rc.d/ttys | 4 ++--
etc/rc.d/virecover | 4 ++--
etc/rc.d/wscons | 4 ++--
etc/rc.d/xdm | 4 ++--
etc/rc.d/xfs | 4 ++--
etc/rc.d/ypbind | 4 ++--
etc/rc.d/yppasswdd | 4 ++--
etc/rc.d/ypserv | 4 ++--
68 files changed, 138 insertions(+), 136 deletions(-)
diffs (truncated from 1608 to 300 lines):
diff -r a1c6eed5debd -r 7971cfdcfeb4 etc/rc.d/accounting
--- a/etc/rc.d/accounting Sat May 13 08:23:45 2000 +0000
+++ b/etc/rc.d/accounting Sat May 13 08:45:06 2000 +0000
@@ -1,13 +1,12 @@
#!/bin/sh
#
-# $NetBSD: accounting,v 1.1.1.1 2000/03/10 11:53:25 lukem Exp $
+# $NetBSD: accounting,v 1.2 2000/05/13 08:45:06 lukem Exp $
#
# PROVIDE: accounting
# REQUIRE: mountall
. /etc/rc.subr
-. /etc/rc.conf
name="accounting"
start_precmd="checkyesno accounting"
@@ -29,4 +28,5 @@
/usr/sbin/accton
}
+load_rc_config $name
run_rc_command "$1"
diff -r a1c6eed5debd -r 7971cfdcfeb4 etc/rc.d/amd
--- a/etc/rc.d/amd Sat May 13 08:23:45 2000 +0000
+++ b/etc/rc.d/amd Sat May 13 08:45:06 2000 +0000
@@ -1,13 +1,12 @@
#!/bin/sh
#
-# $NetBSD: amd,v 1.2 2000/04/15 21:14:50 tsarna Exp $
+# $NetBSD: amd,v 1.3 2000/05/13 08:45:06 lukem Exp $
#
# PROVIDE: amd
# REQUIRE: portmap mountall ypbind
. /etc/rc.subr
-. /etc/rc.conf
name="amd"
command="/usr/sbin/${name}"
@@ -16,4 +15,5 @@
required_dirs="$amd_dir"
required_vars="portmap"
+load_rc_config $name
run_rc_command "$1"
diff -r a1c6eed5debd -r 7971cfdcfeb4 etc/rc.d/apmd
--- a/etc/rc.d/apmd Sat May 13 08:23:45 2000 +0000
+++ b/etc/rc.d/apmd Sat May 13 08:45:06 2000 +0000
@@ -1,15 +1,15 @@
#!/bin/sh
#
-# $NetBSD: apmd,v 1.2 2000/03/13 04:03:55 lukem Exp $
+# $NetBSD: apmd,v 1.3 2000/05/13 08:45:06 lukem Exp $
#
# PROVIDE: apmd
# REQUIRE: DAEMON
. /etc/rc.subr
-. /etc/rc.conf
name="apmd"
command="/usr/sbin/${name}"
+load_rc_config $name
run_rc_command "$1"
diff -r a1c6eed5debd -r 7971cfdcfeb4 etc/rc.d/bootparams
--- a/etc/rc.d/bootparams Sat May 13 08:23:45 2000 +0000
+++ b/etc/rc.d/bootparams Sat May 13 08:45:06 2000 +0000
@@ -1,16 +1,16 @@
#!/bin/sh
#
-# $NetBSD: bootparams,v 1.2 2000/03/13 04:03:55 lukem Exp $
+# $NetBSD: bootparams,v 1.3 2000/05/13 08:45:06 lukem Exp $
#
# PROVIDE: bootparams
# REQUIRE: portmap DAEMON
. /etc/rc.subr
-. /etc/rc.conf
name="bootparamd"
command="/usr/sbin/rpc.${name}"
required_files="/etc/bootparams"
+load_rc_config $name
run_rc_command "$1"
diff -r a1c6eed5debd -r 7971cfdcfeb4 etc/rc.d/ccd
--- a/etc/rc.d/ccd Sat May 13 08:23:45 2000 +0000
+++ b/etc/rc.d/ccd Sat May 13 08:45:06 2000 +0000
@@ -1,12 +1,11 @@
#!/bin/sh
#
-# $NetBSD: ccd,v 1.2 2000/04/26 05:13:51 thorpej Exp $
+# $NetBSD: ccd,v 1.3 2000/05/13 08:45:06 lukem Exp $
#
# PROVIDE: disks
. /etc/rc.subr
-. /etc/rc.conf
name="ccd"
start_cmd="ccd_start"
@@ -20,4 +19,5 @@
fi
}
+load_rc_config $name
run_rc_command "$1"
diff -r a1c6eed5debd -r 7971cfdcfeb4 etc/rc.d/cleartmp
--- a/etc/rc.d/cleartmp Sat May 13 08:23:45 2000 +0000
+++ b/etc/rc.d/cleartmp Sat May 13 08:45:06 2000 +0000
@@ -1,13 +1,12 @@
#!/bin/sh
#
-# $NetBSD: cleartmp,v 1.1.1.1 2000/03/10 11:53:25 lukem Exp $
+# $NetBSD: cleartmp,v 1.2 2000/05/13 08:45:06 lukem Exp $
#
# PROVIDE: cleartmp
# REQUIRE: mountall
. /etc/rc.subr
-. /etc/rc.conf
name="cleartmp"
start_cmd="cleartmp_start"
@@ -27,4 +26,5 @@
! -name quota.group -exec rm -rf -- {} \; -type d -prune)
}
+load_rc_config $name
run_rc_command "$1"
diff -r a1c6eed5debd -r 7971cfdcfeb4 etc/rc.d/cron
--- a/etc/rc.d/cron Sat May 13 08:23:45 2000 +0000
+++ b/etc/rc.d/cron Sat May 13 08:45:06 2000 +0000
@@ -1,16 +1,16 @@
#!/bin/sh
#
-# $NetBSD: cron,v 1.2 2000/03/13 04:03:55 lukem Exp $
+# $NetBSD: cron,v 1.3 2000/05/13 08:45:06 lukem Exp $
#
# PROVIDE: cron
# REQUIRE: LOGIN
. /etc/rc.subr
-. /etc/rc.conf
name="cron"
command="/usr/sbin/${name}"
pidfile="/var/run/${name}.pid"
+load_rc_config $name
run_rc_command "$1"
diff -r a1c6eed5debd -r 7971cfdcfeb4 etc/rc.d/dhclient
--- a/etc/rc.d/dhclient Sat May 13 08:23:45 2000 +0000
+++ b/etc/rc.d/dhclient Sat May 13 08:45:06 2000 +0000
@@ -1,17 +1,17 @@
#!/bin/sh
#
-# $NetBSD: dhclient,v 1.3 2000/04/06 17:19:13 thorpej Exp $
+# $NetBSD: dhclient,v 1.4 2000/05/13 08:45:06 lukem Exp $
#
# PROVIDE: dhclient
# REQUIRE: systemfs syslogd
. /etc/rc.subr
-. /etc/rc.conf
name="dhclient"
command="/sbin/${name}"
pidfile="/var/run/${name}.pid"
required_files="/etc/${name}.conf"
+load_rc_config $name
run_rc_command "$1"
diff -r a1c6eed5debd -r 7971cfdcfeb4 etc/rc.d/dhcpd
--- a/etc/rc.d/dhcpd Sat May 13 08:23:45 2000 +0000
+++ b/etc/rc.d/dhcpd Sat May 13 08:45:06 2000 +0000
@@ -1,17 +1,17 @@
#!/bin/sh
#
-# $NetBSD: dhcpd,v 1.2 2000/03/13 04:03:57 lukem Exp $
+# $NetBSD: dhcpd,v 1.3 2000/05/13 08:45:06 lukem Exp $
#
# PROVIDE: dhcpd
# REQUIRE: DAEMON
. /etc/rc.subr
-. /etc/rc.conf
name="dhcpd"
command="/usr/sbin/${name}"
pidfile="/var/run/${name}.pid"
required_files="/etc/${name}.conf /var/db/${name}.leases"
+load_rc_config $name
run_rc_command "$1"
diff -r a1c6eed5debd -r 7971cfdcfeb4 etc/rc.d/dhcrelay
--- a/etc/rc.d/dhcrelay Sat May 13 08:23:45 2000 +0000
+++ b/etc/rc.d/dhcrelay Sat May 13 08:45:06 2000 +0000
@@ -1,16 +1,16 @@
#!/bin/sh
#
-# $NetBSD: dhcrelay,v 1.2 2000/03/13 04:03:57 lukem Exp $
+# $NetBSD: dhcrelay,v 1.3 2000/05/13 08:45:06 lukem Exp $
#
# PROVIDE: dhcrelay
# REQUIRE: DAEMON
. /etc/rc.subr
-. /etc/rc.conf
name="dhcrelay"
command="/usr/sbin/${name}"
pidfile="/var/run/${name}.pid"
+load_rc_config $name
run_rc_command "$1"
diff -r a1c6eed5debd -r 7971cfdcfeb4 etc/rc.d/dmesg
--- a/etc/rc.d/dmesg Sat May 13 08:23:45 2000 +0000
+++ b/etc/rc.d/dmesg Sat May 13 08:45:06 2000 +0000
@@ -1,13 +1,12 @@
#!/bin/sh
#
-# $NetBSD: dmesg,v 1.2 2000/04/30 12:39:56 lukem Exp $
+# $NetBSD: dmesg,v 1.3 2000/05/13 08:45:06 lukem Exp $
#
# PROVIDE: dmesg
# REQUIRE: systemfs
. /etc/rc.subr
-. /etc/rc.conf
name="dmesg"
start_precmd="checkyesno dmesg"
@@ -20,4 +19,5 @@
dmesg $dmesg_flags > /var/run/dmesg.boot
}
+load_rc_config $name
run_rc_command "$1"
diff -r a1c6eed5debd -r 7971cfdcfeb4 etc/rc.d/gated
--- a/etc/rc.d/gated Sat May 13 08:23:45 2000 +0000
+++ b/etc/rc.d/gated Sat May 13 08:45:06 2000 +0000
@@ -1,17 +1,17 @@
#!/bin/sh
#
-# $NetBSD: gated,v 1.2 2000/03/13 04:03:57 lukem Exp $
+# $NetBSD: gated,v 1.3 2000/05/13 08:45:06 lukem Exp $
#
# PROVIDE: gated
# REQUIRE: DAEMON
. /etc/rc.subr
-. /etc/rc.conf
name="gated"
command="/usr/sbin/${name}"
pidfile="/var/run/${name}.pid"
required_files="/etc/${name}.conf"
+load_rc_config $name
run_rc_command "$1"
diff -r a1c6eed5debd -r 7971cfdcfeb4 etc/rc.d/inetd
--- a/etc/rc.d/inetd Sat May 13 08:23:45 2000 +0000
+++ b/etc/rc.d/inetd Sat May 13 08:45:06 2000 +0000
@@ -1,13 +1,12 @@
#!/bin/sh
#
-# $NetBSD: inetd,v 1.3 2000/04/30 13:23:32 lukem Exp $
+# $NetBSD: inetd,v 1.4 2000/05/13 08:45:06 lukem Exp $
#
# PROVIDE: inetd
# REQUIRE: DAEMON LOGIN
. /etc/rc.subr
-. /etc/rc.conf
name="inetd"
command="/usr/sbin/${name}"
@@ -15,4 +14,5 @@
required_files="/etc/${name}.conf"
extra_commands="reload"
+load_rc_config $name
run_rc_command "$1"
diff -r a1c6eed5debd -r 7971cfdcfeb4 etc/rc.d/ipfilter
Home |
Main Index |
Thread Index |
Old Index