diff options
author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-03-28 06:59:13 -0700 |
---|---|---|
committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-03-28 06:59:13 -0700 |
commit | 84727ad72887808182e17db386158261c7ff14ad (patch) | |
tree | 5238e8d5b886d53aacc29ff580d2b9891744e589 /redhat | |
parent | aacbd15de9d6985dba876337547d73fb4cabfacb (diff) | |
parent | b1cd0e1d5b935ca1f3934930e83ea69acca77fb4 (diff) | |
download | bcfg2-84727ad72887808182e17db386158261c7ff14ad.tar.gz bcfg2-84727ad72887808182e17db386158261c7ff14ad.tar.bz2 bcfg2-84727ad72887808182e17db386158261c7ff14ad.zip |
Merge pull request #66 from fennm/bcfg2-init-retval-fixes
Pass through retval from start, stop, status, etc. in init scripts
Diffstat (limited to 'redhat')
-rwxr-xr-x | redhat/scripts/bcfg2-report-collector.init | 9 | ||||
-rwxr-xr-x | redhat/scripts/bcfg2-server.init | 3 | ||||
-rwxr-xr-x | redhat/scripts/bcfg2.init | 4 |
3 files changed, 13 insertions, 3 deletions
diff --git a/redhat/scripts/bcfg2-report-collector.init b/redhat/scripts/bcfg2-report-collector.init index a8e23f080..43e875a6b 100755 --- a/redhat/scripts/bcfg2-report-collector.init +++ b/redhat/scripts/bcfg2-report-collector.init @@ -32,6 +32,7 @@ test -x $DAEMON || exit 5 # Internal variables BINARY=$(basename $DAEMON) +RETVAL=0 start () { echo -n "Starting Configuration Report Collector: " @@ -79,22 +80,26 @@ status () { case "$1" in start) start + RETVAL=$? ;; stop) stop + RETVAL=$? ;; status) status + RETVAL=$? ;; restart|reload|force-reload) stop sleep 5 start + RETVAL=$? ;; *) echo "Usage: $0 {start|stop|status|reload|restart|force-reload}" - exit 1 + RETVAL=1 ;; esac -exit 0 +exit $RETVAL diff --git a/redhat/scripts/bcfg2-server.init b/redhat/scripts/bcfg2-server.init index ffac6ac3d..c4412d1c3 100755 --- a/redhat/scripts/bcfg2-server.init +++ b/redhat/scripts/bcfg2-server.init @@ -59,9 +59,11 @@ stop () { case "$1" in start) start + RETVAL=$? ;; stop) stop + RETVAL=$? ;; status) status $prog @@ -71,6 +73,7 @@ case "$1" in stop sleep 5 start + RETVAL=$? ;; *) echo $"Usage: $0 {start|stop|status|restart|reload|force-reload}" diff --git a/redhat/scripts/bcfg2.init b/redhat/scripts/bcfg2.init index 5cfdf47bc..9c26434ff 100755 --- a/redhat/scripts/bcfg2.init +++ b/redhat/scripts/bcfg2.init @@ -54,12 +54,14 @@ start () { case "$1" in start) start + RETVAL=$? ;; stop|status) - exit 0 + RETVAL=0 ;; restart|force-reload) start + RETVAL=$? ;; *) echo "Usage: $0 {start|stop|status|restart|force-reload}" |