aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2008-04-08 01:12:13 -0400
committerBill Nottingham <notting@redhat.com>2008-04-08 01:12:13 -0400
commitd61552366c960cae6f5a52d493185ec8d8e716cd (patch)
tree279ce139a56ca6040fa89b2cc578495ca710c1b7
parent6d61a919350e2f9011de5ae95a8a6a182b19c242 (diff)
downloadinitscripts-d61552366c960cae6f5a52d493185ec8d8e716cd.tar
initscripts-d61552366c960cae6f5a52d493185ec8d8e716cd.tar.gz
initscripts-d61552366c960cae6f5a52d493185ec8d8e716cd.tar.bz2
initscripts-d61552366c960cae6f5a52d493185ec8d8e716cd.tar.xz
initscripts-d61552366c960cae6f5a52d493185ec8d8e716cd.zip
Fix various shutdown-related weirdness. (#438444)
[ -f /var/lock/subsys/$subsys -o -f /var/lock/subsys/$subsys.init ] \ || continue and [ -f /var/lock/subsys/$subsys ] || continue [ -f /var/lock/subsys/$subsys.init ] || continue ? NOT EQUIVALENT. *whacks self in head*
-rwxr-xr-xrc.d/rc3
1 files changed, 1 insertions, 2 deletions
diff --git a/rc.d/rc b/rc.d/rc
index 316751a4..0d1abd12 100755
--- a/rc.d/rc
+++ b/rc.d/rc
@@ -66,8 +66,7 @@ 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 ] || continue
- [ -f /var/lock/subsys/$subsys.init ] || continue
+ [ -f /var/lock/subsys/$subsys -o -f /var/lock/subsys/$subsys.init ] || continue
check_runlevel "$i" || continue
# Bring the subsystem down.