[Pkg-utopia-commits] r3513 - in /packages/unstable/networkmanager/debian: changelog network-manager.init

[biebl at users.alioth.debian.org]

Author: biebl
Date: Mon Feb  8 16:01:27 2010
New Revision: 3513

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=3513
Log:
* debian/network-manager.init
  - Don't use "set -e".
  - Print meaningful messages on start and stop in case the daemon is already
    running resp. already stopped.

Modified:
    packages/unstable/networkmanager/debian/changelog
    packages/unstable/networkmanager/debian/network-manager.init

Modified: packages/unstable/networkmanager/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/networkmanager/debian/changelog?rev=3513&op=diff
==============================================================================
--- packages/unstable/networkmanager/debian/changelog (original)
+++ packages/unstable/networkmanager/debian/changelog Mon Feb  8 16:01:27 2010
@@ -16,6 +16,10 @@
     - Bump Breaks for network-manager-kde to (<< 1:0.9~~). The KDE3 version no
       longer works correctly with this version of network-manager.
     - Bump Standards-Version to 3.8.4. No further changes.
+  * debian/network-manager.init
+    - Don't use "set -e".
+    - Print meaningful messages on start and stop in case the daemon is already
+      running resp. already stopped.
 
  -- Michael Biebl <biebl at debian.org>  Mon, 08 Feb 2010 16:41:20 +0100
 

Modified: packages/unstable/networkmanager/debian/network-manager.init
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/networkmanager/debian/network-manager.init?rev=3513&op=diff
==============================================================================
--- packages/unstable/networkmanager/debian/network-manager.init (original)
+++ packages/unstable/networkmanager/debian/network-manager.init Mon Feb  8 16:01:27 2010
@@ -11,8 +11,6 @@
 # Description:       Daemon for automatically switching network 
 #		     connections to the best available connection.
 ### END INIT INFO
-
-set -e
 
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 DESC="network connection manager"
@@ -36,7 +34,7 @@
 #
 d_start() {
 	start-stop-daemon --start --quiet --pidfile $PIDFILE \
-		--oknodo --exec $DAEMON -- $DAEMON_OPTS
+		--exec $DAEMON -- $DAEMON_OPTS
 }
 
 #
@@ -44,7 +42,7 @@
 #
 d_stop() {
 	start-stop-daemon --stop --retry 5 --quiet --pidfile $PIDFILE \
-		 --oknodo $USER --exec $DAEMON
+		--exec $DAEMON
 }
 
 
@@ -52,18 +50,26 @@
   start)
 	log_daemon_msg "Starting $DESC" "$NAME"
 	d_start
-	log_end_msg $?
+	case "$?" in
+		0) log_end_msg 0 ;;
+		1) log_progress_msg "already started"
+		   log_end_msg 0 ;;
+		*) log_end_msg 1 ;;
+	esac
 	;;
   stop)
 	log_daemon_msg "Stopping $DESC" "$NAME"
 	d_stop
-	log_end_msg $?
+	case "$?" in
+		0) log_end_msg 0 ;;
+		1) log_progress_msg "already stopped"
+		   log_end_msg 0 ;;
+		*) log_end_msg 1 ;;
+	esac
 	;;
   restart|force-reload)
-	log_daemon_msg "Restarting $DESC" "$NAME"
-	d_stop
-	d_start
-	log_end_msg $?
+	$0 stop
+	$0 start
 	;;
   status)
 	status_of_proc -p $PIDFILE $DAEMON $NAME && exit 0 || exit $?