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

[biebl at users.alioth.debian.org]

Author: biebl
Date: Thu Jan 21 23:38:01 2010
New Revision: 3393

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=3393
Log:
Update init script

* debian/network-manager.init
  - Update LSB header: Replace hal dependency with udev.
  - The nm-system-settings daemon has been merged into the NetworkManager
    daemon, so we no longer need to kill nm-system-settings on "stop".

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

Modified: packages/experimental/networkmanager/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/experimental/networkmanager/debian/changelog?rev=3393&op=diff
==============================================================================
--- packages/experimental/networkmanager/debian/changelog (original)
+++ packages/experimental/networkmanager/debian/changelog Thu Jan 21 23:38:01 2010
@@ -29,6 +29,10 @@
     - Replace hal Depends with udev.
     - Replace policykit Recommends with policykit-1.
     - Update package description: policykit → policykit-1.
+  * debian/network-manager.init
+    - Update LSB header: Replace hal dependency with udev.
+    - The nm-system-settings daemon has been merged into the NetworkManager
+      daemon, so we no longer need to kill nm-system-settings on "stop".
 
  -- Michael Biebl <biebl at debian.org>  Sun, 29 Nov 2009 10:19:59 +0100
 

Modified: packages/experimental/networkmanager/debian/network-manager.init
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/experimental/networkmanager/debian/network-manager.init?rev=3393&op=diff
==============================================================================
--- packages/experimental/networkmanager/debian/network-manager.init (original)
+++ packages/experimental/networkmanager/debian/network-manager.init Thu Jan 21 23:38:01 2010
@@ -1,8 +1,8 @@
 #! /bin/sh
 ### BEGIN INIT INFO
 # Provides:          network-manager
-# Required-Start:    $remote_fs dbus hal
-# Required-Stop:     $remote_fs dbus hal
+# Required-Start:    $remote_fs dbus udev
+# Required-Stop:     $remote_fs dbus udev
 # Should-Start:	     $syslog
 # Should-Stop:       $syslog
 # Default-Start:     2 3 4 5
@@ -44,11 +44,7 @@
 #
 d_stop() {
 	start-stop-daemon --stop --retry 5 --quiet --pidfile $PIDFILE \
-		 --oknodo --exec $DAEMON
-
-	# kill the system settings daemon
-	start-stop-daemon --stop --retry 5 --quiet \
-		 --oknodo --exec /usr/sbin/nm-system-settings
+		 --oknodo $USER --exec $DAEMON
 }