diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | debian/network-manager.init | 26 |
2 files changed, 20 insertions, 10 deletions
diff --git a/debian/changelog b/debian/changelog index fe123400..e295df75 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,6 +16,10 @@ network-manager (0.7.999-3) UNRELEASED; urgency=low - Bump Breaks for network-manager-kde to (<< 1:0.9~~). The KDE3 version no longer works correctly with this version of network-manager. - Bump Standards-Version to 3.8.4. No further changes. + * debian/network-manager.init + - Don't use "set -e". + - Print meaningful messages on start and stop in case the daemon is already + running resp. already stopped. -- Michael Biebl <biebl@debian.org> Mon, 08 Feb 2010 16:41:20 +0100 diff --git a/debian/network-manager.init b/debian/network-manager.init index ea6d2ee9..18323a88 100644 --- a/debian/network-manager.init +++ b/debian/network-manager.init @@ -12,8 +12,6 @@ # connections to the best available connection. ### END INIT INFO -set -e - PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin DESC="network connection manager" NAME="NetworkManager" @@ -36,7 +34,7 @@ test -f /etc/default/NetworkManager && . /etc/default/NetworkManager # d_start() { start-stop-daemon --start --quiet --pidfile $PIDFILE \ - --oknodo --exec $DAEMON -- $DAEMON_OPTS + --exec $DAEMON -- $DAEMON_OPTS } # @@ -44,7 +42,7 @@ d_start() { # d_stop() { start-stop-daemon --stop --retry 5 --quiet --pidfile $PIDFILE \ - --oknodo $USER --exec $DAEMON + --exec $DAEMON } @@ -52,18 +50,26 @@ case "$1" in start) log_daemon_msg "Starting $DESC" "$NAME" d_start - log_end_msg $? + case "$?" in + 0) log_end_msg 0 ;; + 1) log_progress_msg "already started" + log_end_msg 0 ;; + *) log_end_msg 1 ;; + esac ;; stop) log_daemon_msg "Stopping $DESC" "$NAME" d_stop - log_end_msg $? + case "$?" in + 0) log_end_msg 0 ;; + 1) log_progress_msg "already stopped" + log_end_msg 0 ;; + *) log_end_msg 1 ;; + esac ;; restart|force-reload) - log_daemon_msg "Restarting $DESC" "$NAME" - d_stop - d_start - log_end_msg $? + $0 stop + $0 start ;; status) status_of_proc -p $PIDFILE $DAEMON $NAME && exit 0 || exit $? |