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

[biebl at users.alioth.debian.org]

Author: biebl
Date: Thu Jan 24 23:21:18 2008
New Revision: 2059

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=2059
Log:
* debian/network-manager.init,
  debian/network-manager.network-manager-dispatcher.init
  - Fix LSB init header. Use $remote_fs instead of $local_fs as the
    daemon requires /usr to be mounted. 
    Remove S from Should-Stop. (Closes: #459480)
  - Shorten retry-time to 5 secs on stop.
  - Don't fail to start if daemon is already running.

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

Modified: packages/unstable/networkmanager/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/networkmanager/debian/changelog?rev=2059&op=diff
==============================================================================
--- packages/unstable/networkmanager/debian/changelog (original)
+++ packages/unstable/networkmanager/debian/changelog Thu Jan 24 23:21:18 2008
@@ -18,8 +18,15 @@
   * debian/patches/27-dont_repeat_errors.patch
     - Backported r3160 from upstream stable branch.
     - Don't repeat killswitch errors too often. (Closes: #456363)
-
- -- Michael Biebl <biebl at debian.org>  Fri, 25 Jan 2008 00:07:19 +0100
+  * debian/network-manager.init,
+    debian/network-manager.network-manager-dispatcher.init
+    - Fix LSB init header. Use $remote_fs instead of $local_fs as the
+      daemon requires /usr to be mounted. 
+      Remove S from Should-Stop. (Closes: #459480)
+    - Shorten retry-time to 5 secs on stop.
+    - Don't fail to start if daemon is already running.
+
+ -- Michael Biebl <biebl at debian.org>  Fri, 25 Jan 2008 00:11:47 +0100
 
 network-manager (0.6.5-4) unstable; urgency=low
 

Modified: packages/unstable/networkmanager/debian/network-manager.init
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/networkmanager/debian/network-manager.init?rev=2059&op=diff
==============================================================================
--- packages/unstable/networkmanager/debian/network-manager.init (original)
+++ packages/unstable/networkmanager/debian/network-manager.init Thu Jan 24 23:21:18 2008
@@ -1,12 +1,12 @@
 #! /bin/sh
 ### BEGIN INIT INFO
 # Provides:          NetworkManager
-# Required-Start:    $local_fs dbus dhcdbd hal
-# Required-Stop:     $local_fs dbus dhcdbd hal
+# Required-Start:    $remote_fs dbus dhcdbd hal
+# Required-Stop:     $remote_fs dbus dhcdbd hal
 # Should-Start:	     $syslog
 # Should-Stop:       $syslog
 # Default-Start:     2 3 4 5
-# Default-Stop:      S 0 1 6
+# Default-Stop:      0 1 6
 # Short-Description: network connection manager
 # Description:       Daemon for automatically switching network 
 #		     connections to the best available connection.
@@ -34,7 +34,6 @@
 
 . /lib/lsb/init-functions
 
-test -f /etc/default/rcS && . /etc/default/rcS
 test -f /etc/default/NetworkManager && . /etc/default/NetworkManager
 
 #
@@ -47,7 +46,7 @@
 	fi
 
 	start-stop-daemon --start --quiet --pidfile $PIDFILE \
-		--user $USER --exec $DAEMON -- $DAEMON_OPTS --pid-file $PIDFILE
+		--oknodo --user $USER --exec $DAEMON -- $DAEMON_OPTS --pid-file $PIDFILE
 		
 }
 
@@ -55,7 +54,7 @@
 #	Function that stops the daemon/service.
 #
 d_stop() {
-	start-stop-daemon --stop --retry 60 --quiet --pidfile $PIDFILE \
+	start-stop-daemon --stop --retry 5 --quiet --pidfile $PIDFILE \
 		 --oknodo --user $USER --exec $DAEMON
 		 
 }

Modified: packages/unstable/networkmanager/debian/network-manager.network-manager-dispatcher.init
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/networkmanager/debian/network-manager.network-manager-dispatcher.init?rev=2059&op=diff
==============================================================================
--- packages/unstable/networkmanager/debian/network-manager.network-manager-dispatcher.init (original)
+++ packages/unstable/networkmanager/debian/network-manager.network-manager-dispatcher.init Thu Jan 24 23:21:18 2008
@@ -1,12 +1,12 @@
 #! /bin/sh
 ### BEGIN INIT INFO
 # Provides:          NetworkManagerDispatcher
-# Required-Start:    $local_fs
-# Required-Stop:     $local_fs
+# Required-Start:    $remote_fs
+# Required-Stop:     $remote_fs
 # Should-Start:	     $syslog
 # Should-Stop:       $syslog
 # Default-Start:     2 3 4 5
-# Default-Stop:      S 0 1 6
+# Default-Stop:      0 1 6
 # Short-Description: network events dispatcher
 # Description:       This daemon automatically runs scripts when 
 #                    NetworkManager changes the network state.
@@ -28,7 +28,6 @@
 
 . /lib/lsb/init-functions
 
-test -f /etc/default/rcS && . /etc/default/rcS
 test -f /etc/default/NetworkManagerDispatcher && . /etc/default/NetworkManagerDispatcher
 
 #
@@ -41,7 +40,7 @@
 	fi
 
 	start-stop-daemon --start --quiet --pidfile $PIDFILE \
-		--user $USER --exec $DAEMON -- $DAEMON_OPTS --pid-file $PIDFILE
+		--oknodo --user $USER --exec $DAEMON -- $DAEMON_OPTS --pid-file $PIDFILE
 
 }
 
@@ -49,7 +48,7 @@
 #	Function that stops the daemon/service.
 #
 d_stop() {
-	start-stop-daemon --stop --retry 60 --quiet --pidfile $PIDFILE \
+	start-stop-daemon --stop --retry 5 --quiet --pidfile $PIDFILE \
 		 --oknodo --user $USER --exec $DAEMON
 }