diff options
Diffstat (limited to 'debian/network-manager.init')
| -rw-r--r-- | debian/network-manager.init | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/debian/network-manager.init b/debian/network-manager.init index 18797994..250971bb 100644 --- a/debian/network-manager.init +++ b/debian/network-manager.init @@ -1,6 +1,6 @@ #! /bin/sh ### BEGIN INIT INFO -# Provides: NetworkManager +# Provides: network-manager # Required-Start: $remote_fs dbus hal # Required-Stop: $remote_fs dbus hal # Should-Start: $syslog @@ -20,11 +20,9 @@ NAME="NetworkManager" DAEMON=/usr/sbin/$NAME -PIDDIR=/var/run/NetworkManager -PIDFILE=$PIDDIR/$NAME.pid +PIDFILE=/var/run/$NAME.pid SCRIPTNAME=/etc/init.d/network-manager -USER=root # Gracefully exit if the package has been removed. test -x $DAEMON || exit 0 @@ -37,14 +35,8 @@ test -f /etc/default/NetworkManager && . /etc/default/NetworkManager # Function that starts the daemon/service. # d_start() { - if [ ! -d $PIDDIR ]; then - mkdir -p $PIDDIR - chown $USER:$USER $PIDDIR - fi - start-stop-daemon --start --quiet --pidfile $PIDFILE \ - --oknodo --user $USER --exec $DAEMON -- $DAEMON_OPTS --pid-file $PIDFILE - + --oknodo --exec $DAEMON -- $DAEMON_OPTS } # @@ -52,8 +44,11 @@ d_start() { # d_stop() { start-stop-daemon --stop --retry 5 --quiet --pidfile $PIDFILE \ - --oknodo --user $USER --exec $DAEMON - + --oknodo --exec $DAEMON + + # kill the system settings daemon + start-stop-daemon --stop --retry 5 --quiet \ + --oknodo --exec /usr/sbin/nm-system-settings } |