avahi: Prevent the service from blocking the shutdown

When the service is not running, the kill command will return an error
which will not be caught and forwarded to the caller of the initscript.
That way, the boot process might be paused which is fixed by this patch.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/lfs/avahi b/lfs/avahi
index 1df11c70e79c3a59a08ece4c182460e21397fbfb..d391b6511003430f4b28cb392b64f014af115da0 100644 (file)
--- a/lfs/avahi
+++ b/lfs/avahi
@@ -34,7 +34,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = avahi
-PAK_VER    = 14
+PAK_VER    = 15
 
 DEPS       = dbus libdaemon
 

diff --git a/src/initscripts/packages/avahi b/src/initscripts/packages/avahi
index 9f1791121a4f435b4f15d64681c94202a9153eff..d4d4a089c1ac085144eab620bab7a3a8506fca3b 100644 (file)
--- a/src/initscripts/packages/avahi
+++ b/src/initscripts/packages/avahi
@@ -30,7 +30,8 @@ case "$1" in
 
        stop)
                boot_mesg "Stopping avahi..."
-               /usr/sbin/avahi-daemon -k
+               /usr/sbin/avahi-daemon -k &>/dev/null
+               evaluate_retval
                ;;
 
        reload)