diff options
| author | Michael Biebl <biebl@teco.edu> | 2006-02-28 18:43:34 +0000 |
|---|---|---|
| committer | Michael Biebl <biebl@teco.edu> | 2006-02-28 18:43:34 +0000 |
| commit | 87ba917c89a8921aebc2b64ba935d3c88709c576 (patch) | |
| tree | 37104ac86a9c3c7d3c167d63fd4517987c125c54 | |
| parent | 2b0e6d9c6ecaf94143962fb5c1c59009b69ac09c (diff) | |
NM now has a pid-file option. So let's use it.
git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@681 ceb527fc-18e6-0310-9fe2-813c157c29e7
| -rw-r--r-- | debian/network-manager-dispatcher.dbus-event | 7 | ||||
| -rw-r--r-- | debian/network-manager.dbus-event | 15 |
2 files changed, 6 insertions, 16 deletions
diff --git a/debian/network-manager-dispatcher.dbus-event b/debian/network-manager-dispatcher.dbus-event index e8c216f2..70747683 100644 --- a/debian/network-manager-dispatcher.dbus-event +++ b/debian/network-manager-dispatcher.dbus-event @@ -42,10 +42,9 @@ d_start() { fi start-stop-daemon --start --quiet --pidfile $PIDFILE \ - --user $USER --exec $DAEMON -- $DAEMON_OPTS - RETVAL=$? - log_end_msg $RETVAL - [ $RETVAL -eq 0 ] && echo `/bin/pidof $NAME` > $PIDFILE + --user $USER --exec $DAEMON -- $DAEMON_OPTS --pid-file $PIDFILE + + log_end_msg $? } # diff --git a/debian/network-manager.dbus-event b/debian/network-manager.dbus-event index f18ea28e..5556f018 100644 --- a/debian/network-manager.dbus-event +++ b/debian/network-manager.dbus-event @@ -23,7 +23,6 @@ DAEMON=/usr/sbin/$NAME PIDDIR=/var/run/NetworkManager PIDFILE=$PIDDIR/$NAME.pid -NAMED_PIDFILE=/var/lib/NetworkManager/NetworkManager-pid-named SCRIPTNAME=/etc/dbus-1/event.d/25$NAME USER=root @@ -54,12 +53,9 @@ d_start() { chmod 755 /var/lib/NetworkManager start-stop-daemon --start --quiet --pidfile $PIDFILE \ - --user $USER --exec $DAEMON -- $DAEMON_OPTS - RETVAL=$? - log_end_msg $RETVAL - [ $RETVAL -eq 0 ] && echo `/bin/pidof $NAME` > $PIDFILE - - + --user $USER --exec $DAEMON -- $DAEMON_OPTS --pid-file $PIDFILE + + log_end_msg $? } # @@ -76,11 +72,6 @@ d_stop() { kill -9 $(cat $PIDFILE) || true rm -f $PIDFILE fi - if [ -e $NAMED_PIDFILE ]; then - kill -9 $(cat $NAMED_PIDFILE) || true - rm -f $NAMED_PIDFILE - fi - } |