summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntoine Jacoutot <ajacoutot@cvs.openbsd.org>2011-07-08 16:20:14 +0000
committerAntoine Jacoutot <ajacoutot@cvs.openbsd.org>2011-07-08 16:20:14 +0000
commit2c19a68e63c088634b9b110e38f716ed11296a05 (patch)
treea4a065f278b56d04c32bb4b7a9625eb09823187a
parent8b10be849f3534d64dc408fc7e4ca52c3ce37b49 (diff)
Forgot to commit that part yesterday, spotted by sthen@
-rw-r--r--etc/rc14
-rw-r--r--etc/rc.conf4
2 files changed, 9 insertions, 9 deletions
diff --git a/etc/rc b/etc/rc
index 73c28e47b55..67ef220bf57 100644
--- a/etc/rc
+++ b/etc/rc
@@ -1,4 +1,4 @@
-# $OpenBSD: rc,v 1.379 2011/07/08 09:48:18 deraadt Exp $
+# $OpenBSD: rc,v 1.380 2011/07/08 16:20:13 ajacoutot Exp $
# System startup script run by init on autoboot
# or after single-user.
@@ -237,11 +237,11 @@ if [ X"$1" = X"shutdown" ]; then
dd if=/dev/arandom of=/var/db/host.random bs=65536 count=1 >/dev/null 2>&1
chmod 600 /var/db/host.random >/dev/null 2>&1
local _c=$?
- if [ ${_c} -eq 0 -a -n "${rc_scripts}" ]; then
+ if [ ${_c} -eq 0 -a -n "${pkg_scripts}" ]; then
echo -n 'stopping package daemons:'
- while [ -n "${rc_scripts}" ]; do
- _r=${rc_scripts##* }
- rc_scripts=${rc_scripts%%*( )${_r}}
+ while [ -n "${pkg_scripts}" ]; do
+ _r=${pkg_scripts##* }
+ pkg_scripts=${pkg_scripts%%*( )${_r}}
[ -x /etc/rc.d/${_r} ] && /etc/rc.d/${_r} stop
done
echo '.'
@@ -549,9 +549,9 @@ fi
rm -f /etc/rc.firsttime.run
# Run rc.d(8) scripts from packages
-if [ -n "${rc_scripts}" ]; then
+if [ -n "${pkg_scripts}" ]; then
echo -n 'starting package daemons:'
- for _r in $rc_scripts; do
+ for _r in $pkg_scripts; do
[ -x /etc/rc.d/${_r} ] && start_daemon ${_r}
done
echo '.'
diff --git a/etc/rc.conf b/etc/rc.conf
index 25364feb257..1c4284aadbf 100644
--- a/etc/rc.conf
+++ b/etc/rc.conf
@@ -1,6 +1,6 @@
#!/bin/sh -
#
-# $OpenBSD: rc.conf,v 1.151 2011/07/08 04:54:12 robert Exp $
+# $OpenBSD: rc.conf,v 1.152 2011/07/08 16:20:13 ajacoutot Exp $
# set these to "NO" to turn them off. otherwise, they're used as flags
ldpd_flags=NO # for normal use: ""
@@ -112,7 +112,7 @@ shlib_dirs= # extra directories for ldconfig, separated
# rc.d(8) packages scripts
# started in the specified order and stopped in reverse order
-rc_scripts=
+pkg_scripts=
local_rcconf="/etc/rc.conf.local"