[Pkg-cups-devel] r105 - cupsys/branches/cups-1.2/debian

[Martin Pitt]

Author: mpitt
Date: Wed Jan 11 18:31:31 2006
New Revision: 105

Modified:
   cupsys/branches/cups-1.2/debian/changelog
   cupsys/branches/cups-1.2/debian/cupsys.init.d
Log:
debian/cupsys.init.d: Fix arguments of start-stop-daemon and remove
the hideous kill algorithm.



Modified: cupsys/branches/cups-1.2/debian/changelog
==============================================================================
--- cupsys/branches/cups-1.2/debian/changelog	(original)
+++ cupsys/branches/cups-1.2/debian/changelog	Wed Jan 11 18:31:31 2006
@@ -1,9 +1,13 @@
 cupsys (1.1.99.b1.r4885-2) UNRELEASED-experimental; urgency=low
 
   [ Kenshi Muto ]
-  * 
+  *
 
- -- Kenshi Muto <kmuto at debian.org>  Fri, 23 Dec 2005 15:33:41 +0900
+  [ Martin Pitt ]
+  * debian/cupsys.init.d: Fix arguments of start-stop-daemon and remove the
+    hideous kill algorithm.
+
+ -- Martin Pitt <mpitt at debian.org>  Wed, 11 Jan 2006 19:29:51 +0100
 
 cupsys (1.1.99.b1.r4885-1) experimental; urgency=low
 

Modified: cupsys/branches/cups-1.2/debian/cupsys.init.d
==============================================================================
--- cupsys/branches/cups-1.2/debian/cupsys.init.d	(original)
+++ cupsys/branches/cups-1.2/debian/cupsys.init.d	Wed Jan 11 18:31:31 2006
@@ -27,32 +27,8 @@
 	;;
   stop)
 	log_begin_msg "Stopping $DESC: $NAME"
-        if [ -e $PIDFILE ]; then
-            read pid < "$PIDFILE" || true
-        fi
-	start-stop-daemon --stop --quiet --user root --retry TERM/10 --oknodo --pidfile $PIDFILE --name $NAME
-        SSR=$?
-
-        # cupsd is hard to kill sometimes
-        if [ -n "$pid" ]; then
-            if ps -p "$pid" > /dev/null 2>&1; then
-                log_warning_msg "Cups is still running, waiting 5 seconds..."
-                sleep 5
-                if ps -p "$pid" > /dev/null 2>&1; then
-                    log_warning_msg "Forcefully killing cupsd..."
-                    kill -9 "$pid"
-                    sleep 1
-                    if ps -p "$pid" > /dev/null 2>&1; then
-                        log_end_msg 1
-                        exit 1
-                    else
-                        log_end_msg 0
-                    fi
-                fi
-            fi
-        else
-	    log_end_msg $SSR
-        fi
+	start-stop-daemon --stop --quiet --retry 5 --oknodo --pidfile $PIDFILE --name $NAME
+	log_end_msg $?
 	;;
   reload)
 	log_begin_msg "Reloading $DESC: $NAME"
@@ -61,7 +37,7 @@
 	;;
   restart|force-reload)
 	log_begin_msg "Restarting $DESC: $NAME"
-	if start-stop-daemon --stop --quiet --user root --retry TERM/10 --oknodo --pidfile $PIDFILE --name $NAME; then
+	if start-stop-daemon --stop --quiet --retry 5 --oknodo --pidfile $PIDFILE --name $NAME; then
 		start-stop-daemon --start --quiet --pidfile "$PIDFILE" --exec $DAEMON
 	fi
 	log_end_msg $?