commit: 57b9e601a97fac3a044ec5d7e5f11b6219c892b7
Author: William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Sat Jul 5 19:30:33 2014 +0000
Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Wed Jul 9 20:33:48 2014 +0000
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=57b9e601
init.d/local: bring functioning more in line with how sysctl works
- remove the has_executables variable since it isn't used.
- Convert the conditional calls to ewend/vewend to a single call to veend.
- Always call eend after all scripts are executed passing the appropriate
error code.
Because of this change, you will see only an overall status when
starting or stopping local unless you are using verbose mode.
---
init.d/local.in | 22 ++++++----------------
1 file changed, 6 insertions(+), 16 deletions(-)
diff --git a/init.d/local.in b/init.d/local.in
index 06be25f..180735d 100644
--- a/init.d/local.in
+++ b/init.d/local.in
@@ -14,20 +14,17 @@ start()
{
ebegin "Starting local"
- local file has_errors retval
+ local file has_errors=0 retval
eindent
for file in @SYSCONFDIR@/local.d/*.start; do
if [ -x "${file}" ]; then
- has_executables=1
vebegin "Executing \"${file}\""
"${file}" 2>&1 >/dev/null
retval=$?
if [ ${retval} -ne 0 ]; then
has_errors=1
- ewend ${retval} "Execution of \"${file}\"
failed."
- else
- vewend 0
fi
+ veend ${retval} "Execution of \"${file}\" failed."
fi
done
eoutdent
@@ -40,9 +37,7 @@ start()
local_start
fi
- if [ -z "${has_errors}" ]; then
- eend 0
- fi
+ eend ${has_errors}
# We have to end with a zero exit code, because a failed execution
# of an executable @SYSCONFDIR@/local.d/*.start file shouldn't result in
@@ -57,20 +52,17 @@ stop()
{
ebegin "Stopping local"
- local file has_errors retval
+ local file has_errors=0 retval
eindent
for file in @SYSCONFDIR@/local.d/*.stop; do
if [ -x "${file}" ]; then
- has_executables=1
vebegin "Executing \"${file}\""
"${file}" 2>&1 >/dev/null
retval=$?
if [ ${retval} -ne 0 ]; then
has_errors=1
- ewend ${retval} "Execution of \"${file}\"
failed."
- else
- vewend 0
fi
+ veend ${retval} "Execution of \"${file}\" failed."
fi
done
eoutdent
@@ -83,9 +75,7 @@ stop()
local_stop
fi
- if [ -z "${has_errors}" ]; then
- eend 0
- fi
+ eend ${has_errors}
# An executable @SYSCONFDIR@/local.d/*.stop file which failed with a
# non-zero exit status is not a reason to mark this service
