[checkmk-commits] Slightly improved output of apache init script

Module: check_mk Branch: master Commit: fd810d03c00685d8ce5a91e6258f9f6c04e3a1e2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fd810d03c00685… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 1 09:44:23 2017 +0200 Slightly improved output of apache init script Change-Id: Ibe6aca8717c07263552f64ee4713b7ceacb0608b --- omd/packages/apache-omd/skel/etc/init.d/apache | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/omd/packages/apache-omd/skel/etc/init.d/apache b/omd/packages/apache-omd/skel/etc/init.d/apache index 8ff9e80..2d46015 100644 --- a/omd/packages/apache-omd/skel/etc/init.d/apache +++ b/omd/packages/apache-omd/skel/etc/init.d/apache @@ -72,6 +72,7 @@ apache_wait_stop() { # running ? pid=$(pidof_apache) || true if [ -n "${pid:-}" ]; then + echo -n "killing ${pid:-}..." kill ${pid:-} else echo -n '(not running)...' @@ -99,8 +100,9 @@ apache_wait_stop() { } apache_wait_start() { - if pidof_apache >/dev/null 2>&1; then - echo -n '(already running)...' + pid=$(pidof_apache) + if [ -n "$pid" ]; then + echo -n "(already running: $pid)..." return 0 fi