Blame 0007-shutdown.sh-correct-return-code-of-_check_shutdown.patch
|
Harald Hoyer |
eeb1c2 |
From 5cac9e14ecadc21cc5a903101135d07eb3fa60e2 Mon Sep 17 00:00:00 2001
|
|
Harald Hoyer |
eeb1c2 |
From: Harald Hoyer <harald@redhat.com>
|
|
Harald Hoyer |
eeb1c2 |
Date: Wed, 29 Oct 2014 13:51:15 +0100
|
|
Harald Hoyer |
eeb1c2 |
Subject: [PATCH] shutdown.sh: correct return code of _check_shutdown()
|
|
Harald Hoyer |
eeb1c2 |
|
|
Harald Hoyer |
eeb1c2 |
fix commit b09faad8779f5579, which reversed the return code
|
|
Harald Hoyer |
eeb1c2 |
---
|
|
Harald Hoyer |
eeb1c2 |
modules.d/99shutdown/shutdown.sh | 6 +++---
|
|
Harald Hoyer |
eeb1c2 |
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
Harald Hoyer |
eeb1c2 |
|
|
Harald Hoyer |
eeb1c2 |
diff --git a/modules.d/99shutdown/shutdown.sh b/modules.d/99shutdown/shutdown.sh
|
|
Harald Hoyer |
eeb1c2 |
index 98eab1d..c183f9d 100755
|
|
Harald Hoyer |
eeb1c2 |
--- a/modules.d/99shutdown/shutdown.sh
|
|
Harald Hoyer |
eeb1c2 |
+++ b/modules.d/99shutdown/shutdown.sh
|
|
Harald Hoyer |
eeb1c2 |
@@ -84,14 +84,14 @@ fi
|
|
Harald Hoyer |
eeb1c2 |
|
|
Harald Hoyer |
eeb1c2 |
_check_shutdown() {
|
|
Harald Hoyer |
eeb1c2 |
local __f
|
|
Harald Hoyer |
eeb1c2 |
- local __s=1
|
|
Harald Hoyer |
eeb1c2 |
+ local __s=0
|
|
Harald Hoyer |
eeb1c2 |
for __f in $hookdir/shutdown/*.sh; do
|
|
Harald Hoyer |
eeb1c2 |
[ -e "$__f" ] || continue
|
|
Harald Hoyer |
eeb1c2 |
( . "$__f" $1 )
|
|
Harald Hoyer |
eeb1c2 |
if [ $? -eq 0 ]; then
|
|
Harald Hoyer |
eeb1c2 |
rm -f -- $__f
|
|
Harald Hoyer |
eeb1c2 |
else
|
|
Harald Hoyer |
eeb1c2 |
- __s=0
|
|
Harald Hoyer |
eeb1c2 |
+ __s=1
|
|
Harald Hoyer |
eeb1c2 |
fi
|
|
Harald Hoyer |
eeb1c2 |
done
|
|
Harald Hoyer |
eeb1c2 |
return $__s
|
|
Harald Hoyer |
eeb1c2 |
@@ -99,7 +99,7 @@ _check_shutdown() {
|
|
Harald Hoyer |
eeb1c2 |
|
|
Harald Hoyer |
eeb1c2 |
_cnt=0
|
|
Harald Hoyer |
eeb1c2 |
while [ $_cnt -le 40 ]; do
|
|
Harald Hoyer |
eeb1c2 |
- _check_shutdown || break
|
|
Harald Hoyer |
eeb1c2 |
+ _check_shutdown && break
|
|
Harald Hoyer |
eeb1c2 |
_cnt=$(($_cnt+1))
|
|
Harald Hoyer |
eeb1c2 |
done
|
|
Harald Hoyer |
eeb1c2 |
[ $_cnt -ge 40 ] && _check_shutdown final
|