[Pkg-voip-commits] r10599 - in /stun/trunk/debian: changelog init.d

[kilian at alioth.debian.org]

Author: kilian
Date: Sun Dec 21 20:47:16 2014
New Revision: 10599

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=10599
Log:
Fix purge issue when no IPs are configured (Closes: #663682)

Modified:
    stun/trunk/debian/changelog
    stun/trunk/debian/init.d

Modified: stun/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/stun/trunk/debian/changelog?rev=10599&op=diff
==============================================================================
--- stun/trunk/debian/changelog	(original)
+++ stun/trunk/debian/changelog	Sun Dec 21 20:47:16 2014
@@ -7,8 +7,9 @@
   * debian/rules: Update to dh-style and introduce get-orig-source target
   * debian/patches/daemon_noverbose.patch: Removed. Incorporated upstream.
   * debian/patches/fix_non_i386.patch: Disable - seems fixed upstream
+  * Fix purge issue when no IPs are configured (Closes: #663682)
 
- -- Kilian Krause <kilian at debian.org>  Thu, 16 Oct 2014 22:35:56 +0200
+ -- Kilian Krause <kilian at debian.org>  Sun, 21 Dec 2014 21:46:53 +0100
 
 stun (0.96.dfsg-6) unstable; urgency=low
 

Modified: stun/trunk/debian/init.d
URL: http://svn.debian.org/wsvn/pkg-voip/stun/trunk/debian/init.d?rev=10599&op=diff
==============================================================================
--- stun/trunk/debian/init.d	(original)
+++ stun/trunk/debian/init.d	Sun Dec 21 20:47:16 2014
@@ -38,14 +38,6 @@
 if [ "$START_DAEMON" != "true" ] ; then 
 	exit 0
 fi
-if [ -z $PRIMARY_IP ];then
-	echo "No primary IP given. Exiting."
-	exit 1
-fi
-if [ -z $SECONDARY_IP ];then
-	echo "No secondary IP given. Exiting."
-	exit 1
-fi
 if [ -z $PRIMARY_PORT ];then
 	echo "No primary port given. Using default."
 	PRIMARY_PORT=3478
@@ -64,6 +56,14 @@
 
 case "$1" in
   start)
+	if [ -z $PRIMARY_IP ];then
+		echo "No primary IP given. Exiting."
+		exit 1
+	fi
+	if [ -z $SECONDARY_IP ];then
+		echo "No secondary IP given. Exiting."
+		exit 1
+	fi
 	echo -n "Starting $DESC: "
 	start-stop-daemon --start --quiet --background --make-pidfile \
 		--pidfile $PIDFILE \
@@ -73,7 +73,7 @@
   stop)
 	echo -n "Stopping $DESC: "
 	start-stop-daemon --stop --quiet --pidfile $PIDFILE \
-		--chuid $DAEMON_USER --exec $DAEMON
+		--oknodo --chuid $DAEMON_USER --exec $DAEMON
 	echo "$NAME."
 	;;
   #reload)
@@ -89,6 +89,14 @@
 	#	$PIDFILE --exec $DAEMON
   #;;
   restart|force-reload)
+	if [ -z $PRIMARY_IP ];then
+		echo "No primary IP given. Exiting."
+		exit 1
+	fi
+	if [ -z $SECONDARY_IP ];then
+		echo "No secondary IP given. Exiting."
+		exit 1
+	fi
 	#
 	#	If the "reload" option is implemented, move the "force-reload"
 	#	option to the "reload" entry above. If not, "force-reload" is