aboutsummaryrefslogtreecommitdiffstats
path: root/rc.d
diff options
context:
space:
mode:
authorFlorian La Roche <laroche@redhat.com>2002-07-14 06:12:46 +0000
committerFlorian La Roche <laroche@redhat.com>2002-07-14 06:12:46 +0000
commitd3deec1b263cfe043c8034d76f8c0b85eaa40ad4 (patch)
treef2eddd7c9feba63c8d5cf1244d9bc22a47693b69 /rc.d
parent4ee0c0457be4e61d6dd9d650b344df49fd876c01 (diff)
downloadinitscripts-d3deec1b263cfe043c8034d76f8c0b85eaa40ad4.tar
initscripts-d3deec1b263cfe043c8034d76f8c0b85eaa40ad4.tar.gz
initscripts-d3deec1b263cfe043c8034d76f8c0b85eaa40ad4.tar.bz2
initscripts-d3deec1b263cfe043c8034d76f8c0b85eaa40ad4.tar.xz
initscripts-d3deec1b263cfe043c8034d76f8c0b85eaa40ad4.zip
- coding changes only
Diffstat (limited to 'rc.d')
-rwxr-xr-xrc.d/rc10
1 files changed, 5 insertions, 5 deletions
diff --git a/rc.d/rc b/rc.d/rc
index 33b6ed71..7785e8f3 100755
--- a/rc.d/rc
+++ b/rc.d/rc
@@ -56,8 +56,8 @@ for i in /etc/rc$runlevel.d/K* ; do
# Check if the subsystem is already up.
subsys=${i#/etc/rc$runlevel.d/K??}
- [ -f /var/lock/subsys/$subsys ] || \
- [ -f /var/lock/subsys/${subsys}.init ] || continue
+ [ -f /var/lock/subsys/$subsys -o -f /var/lock/subsys/$subsys.init ] \
+ || continue
# Bring the subsystem down.
if egrep -q "(killproc |action )" $i ; then
@@ -73,8 +73,8 @@ for i in /etc/rc$runlevel.d/S* ; do
# Check if the subsystem is already up.
subsys=${i#/etc/rc$runlevel.d/S??}
- [ -f /var/lock/subsys/$subsys ] || \
- [ -f /var/lock/subsys/${subsys}.init ] && continue
+ [ -f /var/lock/subsys/$subsys -o -f /var/lock/subsys/$subsys.init ] \
+ && continue
# If we're in confirmation mode, get user confirmation
if [ -n "$CONFIRM" ]; then
@@ -92,7 +92,7 @@ for i in /etc/rc$runlevel.d/S* ; do
unset LC_ALL
exec $i start
fi
- if egrep -q "(daemon |action )" $i \
+ if egrep -q "(daemon |action )" $i 2>/dev/null \
|| [ "$subsys" = "single" -o "$subsys" = "local" ]; then
$i start
else