From d3deec1b263cfe043c8034d76f8c0b85eaa40ad4 Mon Sep 17 00:00:00 2001
From: Florian La Roche <laroche@redhat.com>
Date: Sun, 14 Jul 2002 06:12:46 +0000
Subject: - coding changes only

---
 rc.d/rc | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'rc.d')

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
-- 
cgit v1.2.1