diff options
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | debian/network-manager.init | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/debian/changelog b/debian/changelog index 54d712f9..5f4d5fab 100644 --- a/debian/changelog +++ b/debian/changelog @@ -29,6 +29,10 @@ network-manager (0.7.998-1) UNRELEASED; urgency=low - 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@debian.org> Sun, 29 Nov 2009 10:19:59 +0100 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 } |