From 55c1c55e0ea0c8669cc45017e281e36cbdb74ca8 Mon Sep 17 00:00:00 2001 From: obrien Date: Sun, 16 Jan 2005 03:12:03 +0000 Subject: "REQUIRE: cleanvar" for all RC's writing into /var/run. --- etc/rc.d/amd | 2 +- etc/rc.d/cron | 2 +- etc/rc.d/dhclient | 2 +- etc/rc.d/dmesg | 2 +- etc/rc.d/inetd | 2 +- etc/rc.d/isdnd | 2 +- etc/rc.d/jail | 2 +- etc/rc.d/ldconfig | 4 +++- etc/rc.d/mountcritremote | 2 +- etc/rc.d/moused | 2 +- etc/rc.d/mrouted | 2 +- etc/rc.d/named | 2 +- etc/rc.d/ntpd | 2 +- etc/rc.d/pflog | 2 +- etc/rc.d/rarpd | 2 +- etc/rc.d/sendmail | 2 +- etc/rc.d/sshd | 2 +- etc/rc.d/watchdogd | 2 +- 18 files changed, 20 insertions(+), 18 deletions(-) (limited to 'etc') diff --git a/etc/rc.d/amd b/etc/rc.d/amd index e445cf3..57218d5 100755 --- a/etc/rc.d/amd +++ b/etc/rc.d/amd @@ -5,7 +5,7 @@ # # PROVIDE: amd -# REQUIRE: rpcbind ypbind nfsclient +# REQUIRE: rpcbind ypbind nfsclient cleanvar # BEFORE: DAEMON # KEYWORD: nojail diff --git a/etc/rc.d/cron b/etc/rc.d/cron index f33264f..d053f32 100755 --- a/etc/rc.d/cron +++ b/etc/rc.d/cron @@ -5,7 +5,7 @@ # # PROVIDE: cron -# REQUIRE: LOGIN +# REQUIRE: LOGIN cleanvar # BEFORE: securelevel # KEYWORD: shutdown diff --git a/etc/rc.d/dhclient b/etc/rc.d/dhclient index a317f32..5d28427 100755 --- a/etc/rc.d/dhclient +++ b/etc/rc.d/dhclient @@ -5,7 +5,7 @@ # # PROVIDE: dhclient -# REQUIRE: netif ipfw ipfilter mountcritlocal +# REQUIRE: netif ipfw ipfilter mountcritlocal cleanvar # BEFORE: NETWORKING # KEYWORD: nojail # diff --git a/etc/rc.d/dmesg b/etc/rc.d/dmesg index 6e2d552..b6fb05a 100755 --- a/etc/rc.d/dmesg +++ b/etc/rc.d/dmesg @@ -5,7 +5,7 @@ # # PROVIDE: dmesg -# REQUIRE: mountcritremote +# REQUIRE: mountcritremote cleanvar # BEFORE: DAEMON # KEYWORD: Daemon nojail diff --git a/etc/rc.d/inetd b/etc/rc.d/inetd index d5b3b44..4944d6a 100755 --- a/etc/rc.d/inetd +++ b/etc/rc.d/inetd @@ -5,7 +5,7 @@ # # PROVIDE: inetd -# REQUIRE: DAEMON LOGIN +# REQUIRE: DAEMON LOGIN cleanvar # KEYWORD: shutdown . /etc/rc.subr diff --git a/etc/rc.d/isdnd b/etc/rc.d/isdnd index 9476505..7ed1628 100644 --- a/etc/rc.d/isdnd +++ b/etc/rc.d/isdnd @@ -7,7 +7,7 @@ # # PROVIDE: isdnd -# REQUIRE: netif mountcritlocal +# REQUIRE: netif mountcritlocal cleanvar # KEYWORD: nojail . /etc/rc.subr diff --git a/etc/rc.d/jail b/etc/rc.d/jail index 535a719..9ad638f 100644 --- a/etc/rc.d/jail +++ b/etc/rc.d/jail @@ -4,7 +4,7 @@ # # PROVIDE: jail -# REQUIRE: LOGIN +# REQUIRE: LOGIN cleanvar # BEFORE: securelevel # KEYWORD: nojail shutdown diff --git a/etc/rc.d/ldconfig b/etc/rc.d/ldconfig index 507118c..4d7632a 100755 --- a/etc/rc.d/ldconfig +++ b/etc/rc.d/ldconfig @@ -5,7 +5,7 @@ # # PROVIDE: ldconfig -# REQUIRE: mountcritremote +# REQUIRE: mountcritremote cleanvar # BEFORE: DAEMON . /etc/rc.subr @@ -28,7 +28,9 @@ ldconfig_start() fi done echo 'ELF ldconfig path:' ${_LDC} +ldconfig -r >/tmp/ldcon.`basename $0`.0before ${ldconfig} -elf ${_ins} ${_LDC} +ldconfig -r >/tmp/ldcon.`basename $0`.1after # Legacy aout support for i386 only case `sysctl -n hw.machine_arch` in diff --git a/etc/rc.d/mountcritremote b/etc/rc.d/mountcritremote index 67e60f0..4b3d2f9 100755 --- a/etc/rc.d/mountcritremote +++ b/etc/rc.d/mountcritremote @@ -5,7 +5,7 @@ # # PROVIDE: mountcritremote -# REQUIRE: NETWORKING root mountcritlocal +# REQUIRE: NETWORKING root mountcritlocal cleanvar # KEYWORD: nojail . /etc/rc.subr diff --git a/etc/rc.d/moused b/etc/rc.d/moused index 9d35a05..ed90703 100644 --- a/etc/rc.d/moused +++ b/etc/rc.d/moused @@ -5,7 +5,7 @@ # # PROVIDE: moused -# REQUIRE: DAEMON +# REQUIRE: DAEMON cleanvar # KEYWORD: nojail . /etc/rc.subr diff --git a/etc/rc.d/mrouted b/etc/rc.d/mrouted index c377276..79e3693 100755 --- a/etc/rc.d/mrouted +++ b/etc/rc.d/mrouted @@ -5,7 +5,7 @@ # # PROVIDE: mrouted -# REQUIRE: netif routing +# REQUIRE: netif routing cleanvar # KEYWORD: nojail . /etc/rc.subr diff --git a/etc/rc.d/named b/etc/rc.d/named index e1bb060..660caed 100755 --- a/etc/rc.d/named +++ b/etc/rc.d/named @@ -5,7 +5,7 @@ # # PROVIDE: named -# REQUIRE: SERVERS +# REQUIRE: SERVERS cleanvar # BEFORE: DAEMON # KEYWORD: shutdown diff --git a/etc/rc.d/ntpd b/etc/rc.d/ntpd index 2481517..407b307 100755 --- a/etc/rc.d/ntpd +++ b/etc/rc.d/ntpd @@ -5,7 +5,7 @@ # # PROVIDE: ntpd -# REQUIRE: DAEMON +# REQUIRE: DAEMON cleanvar # BEFORE: LOGIN # KEYWORD: nojail diff --git a/etc/rc.d/pflog b/etc/rc.d/pflog index 86995e9..4adbdfc 100644 --- a/etc/rc.d/pflog +++ b/etc/rc.d/pflog @@ -4,7 +4,7 @@ # # PROVIDE: pflog -# REQUIRE: root mountcritlocal netif +# REQUIRE: root mountcritlocal netif cleanvar # BEFORE: DAEMON LOGIN # KEYWORD: nojail diff --git a/etc/rc.d/rarpd b/etc/rc.d/rarpd index ea51850..a79da9d 100755 --- a/etc/rc.d/rarpd +++ b/etc/rc.d/rarpd @@ -5,7 +5,7 @@ # # PROVIDE: rarpd -# REQUIRE: DAEMON +# REQUIRE: DAEMON cleanvar # BEFORE: LOGIN # KEYWORD: nojail diff --git a/etc/rc.d/sendmail b/etc/rc.d/sendmail index b7ac600..3164857 100755 --- a/etc/rc.d/sendmail +++ b/etc/rc.d/sendmail @@ -5,7 +5,7 @@ # # PROVIDE: mail -# REQUIRE: LOGIN +# REQUIRE: LOGIN cleanvar # we make mail start late, so that things like .forward's are not # processed until the system is fully operational diff --git a/etc/rc.d/sshd b/etc/rc.d/sshd index e77ddab..2f300d8 100755 --- a/etc/rc.d/sshd +++ b/etc/rc.d/sshd @@ -5,7 +5,7 @@ # # PROVIDE: sshd -# REQUIRE: LOGIN +# REQUIRE: LOGIN cleanvar . /etc/rc.subr diff --git a/etc/rc.d/watchdogd b/etc/rc.d/watchdogd index 9dc22a5..3e12f54 100644 --- a/etc/rc.d/watchdogd +++ b/etc/rc.d/watchdogd @@ -28,7 +28,7 @@ # # PROVIDE: watchdogd -# REQUIRE: DAEMON +# REQUIRE: DAEMON cleanvar # KEYWORD: nojail . /etc/rc.subr -- cgit v1.1