[Pkg-nagios-changes] [SCM] debian packaging of icinga(-core) branch, master, updated. debian/1.6.1-2-22-gc1c3991

[Alexander Wirt]

The following commit has been merged in the master branch:
commit 5bb499c7f72b30ef16b4bb0c491cfe56df7330fe
Author: Alexander Wirt <formorer at debian.org>
Date:   Tue Apr 24 09:02:02 2012 +0200

    Fix bugs in initscript
    
    Git-Dch: Ignore

diff --git a/debian/icinga-idoutils.ido2db.init b/debian/icinga-idoutils.ido2db.init
index 4c35da3..cc61a9f 100644
--- a/debian/icinga-idoutils.ido2db.init
+++ b/debian/icinga-idoutils.ido2db.init
@@ -45,14 +45,26 @@ fi
 
 
 check_started () {
-	start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \
-				|| return 1
+	start-stop-daemon --quiet --pidfile $PIDFILE --exec $DAEMON --status > /dev/null 
+	if [ $? -eq 0 ]
+	then
+		return 1
+	else
+		return 0
+	fi
 }
 
 cleanup_socket () {
 	SOCKET=$( get_config socket_name )
 	test -z "$SOCKET" && return
-	check_started || test -S $SOCKET && rm $SOCKET
+	check_started
+	[ $? -eq 1 ] && return
+	if [ -e $SOCKET ] 
+	then
+		log_warning_msg "Remove stale socket $SOCKET"
+		rm $SOCKET
+	fi
+
 }
 
 #

-- 
debian packaging of icinga(-core)