X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=debian%2Fmetaproxy.init;h=0f36bdda377e5a0f4b02ea8a89534cbac68f4df1;hb=f382c39ab7cdc815ef8320d45dbd878d4f6548f9;hp=2d19055e53bdff4b8e3876ead2dcb3eccc6e4329;hpb=500c577493242dcaaf784de0ba97cd8ec5e18416;p=metaproxy-moved-to-github.git

diff --git a/debian/metaproxy.init b/debian/metaproxy.init
index 2d19055..0f36bdd 100644
--- a/debian/metaproxy.init
+++ b/debian/metaproxy.init
@@ -61,7 +61,7 @@ do_stop()
 	#   1 if daemon was already stopped
 	#   2 if daemon could not be stopped
 	#   other if a failure occurred
-	start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $NAME
+	start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE
 	RETVAL="$?"
 	[ "$RETVAL" = 2 ] && return 2
 	# Wait for children to finish too if this is a daemon that forks
@@ -70,8 +70,8 @@ do_stop()
 	# that waits for the process to drop all resources that could be
 	# needed by services started subsequently.  A last resort is to
 	# sleep for some time.
-	start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --exec $DAEMON
-	[ "$?" = 2 ] && return 2
+	#start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --exec $DAEMON
+	#[ "$?" = 2 ] && return 2
 	# Many daemons don't delete their pidfiles when they exit.
 	rm -f $PIDFILE
 	return "$RETVAL"
@@ -96,7 +96,10 @@ case "$1" in
 	do_start
 	case "$?" in
 		0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
-		2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
+		2) [ "$VERBOSE" = no ] && \
+				log_daemon_msg "Starting $DESC" "$NAME"
+			log_end_msg 1 
+		;;
 	esac
 	;;
   stop)
@@ -104,7 +107,10 @@ case "$1" in
 	do_stop
 	case "$?" in
 		0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
-		2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
+		2) [ "$VERBOSE" = no ] && \
+				log_daemon_msg "Stopping $DESC" "$NAME"
+			log_end_msg 1 
+		;;
 	esac
 	;;
   #reload|force-reload)