about summary refs log tree commit diff
path: root/debian/network-manager.init
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2010-01-21 23:38:01 +0000
committerMichael Biebl <biebl@debian.org>2010-01-21 23:38:01 +0000
commitdb348dabb3bad31bb00bc967aa44fb4a5e0321d3 (patch)
tree70fa28a31a00c21e17eb9d9fe9963a4438c46529 /debian/network-manager.init
parent371a0def16f9a44de724bf34496fb70524f37161 (diff)
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".

git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@3393 ceb527fc-18e6-0310-9fe2-813c157c29e7
Diffstat (limited to 'debian/network-manager.init')
-rw-r--r--debian/network-manager.init10
1 files changed, 3 insertions, 7 deletions
diff --git a/debian/network-manager.init b/debian/network-manager.init
index 250971bb..ea6d2ee9 100644
--- a/debian/network-manager.init
+++ b/debian/network-manager.init
@@ -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_start() {
 #
 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
 }