diff options
| -rw-r--r-- | debian/changelog | 11 | ||||
| -rw-r--r-- | debian/network-manager.init | 11 | ||||
| -rw-r--r-- | debian/network-manager.network-manager-dispatcher.init | 11 |
3 files changed, 19 insertions, 14 deletions
diff --git a/debian/changelog b/debian/changelog index e7e19f3b..896637d6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,8 +18,15 @@ network-manager (0.6.5-5) UNRELEASED; urgency=low * debian/patches/27-dont_repeat_errors.patch - Backported r3160 from upstream stable branch. - Don't repeat killswitch errors too often. (Closes: #456363) - - -- Michael Biebl <biebl@debian.org> Fri, 25 Jan 2008 00:07:19 +0100 + * debian/network-manager.init, + debian/network-manager.network-manager-dispatcher.init + - Fix LSB init header. Use $remote_fs instead of $local_fs as the + daemon requires /usr to be mounted. + Remove S from Should-Stop. (Closes: #459480) + - Shorten retry-time to 5 secs on stop. + - Don't fail to start if daemon is already running. + + -- Michael Biebl <biebl@debian.org> Fri, 25 Jan 2008 00:11:47 +0100 network-manager (0.6.5-4) unstable; urgency=low diff --git a/debian/network-manager.init b/debian/network-manager.init index d096e950..9e6fcf0b 100644 --- a/debian/network-manager.init +++ b/debian/network-manager.init @@ -1,12 +1,12 @@ #! /bin/sh ### BEGIN INIT INFO # Provides: NetworkManager -# Required-Start: $local_fs dbus dhcdbd hal -# Required-Stop: $local_fs dbus dhcdbd hal +# Required-Start: $remote_fs dbus dhcdbd hal +# Required-Stop: $remote_fs dbus dhcdbd hal # Should-Start: $syslog # Should-Stop: $syslog # Default-Start: 2 3 4 5 -# Default-Stop: S 0 1 6 +# Default-Stop: 0 1 6 # Short-Description: network connection manager # Description: Daemon for automatically switching network # connections to the best available connection. @@ -34,7 +34,6 @@ test -x $DAEMON || exit 0 . /lib/lsb/init-functions -test -f /etc/default/rcS && . /etc/default/rcS test -f /etc/default/NetworkManager && . /etc/default/NetworkManager # @@ -47,7 +46,7 @@ d_start() { fi start-stop-daemon --start --quiet --pidfile $PIDFILE \ - --user $USER --exec $DAEMON -- $DAEMON_OPTS --pid-file $PIDFILE + --oknodo --user $USER --exec $DAEMON -- $DAEMON_OPTS --pid-file $PIDFILE } @@ -55,7 +54,7 @@ d_start() { # Function that stops the daemon/service. # d_stop() { - start-stop-daemon --stop --retry 60 --quiet --pidfile $PIDFILE \ + start-stop-daemon --stop --retry 5 --quiet --pidfile $PIDFILE \ --oknodo --user $USER --exec $DAEMON } diff --git a/debian/network-manager.network-manager-dispatcher.init b/debian/network-manager.network-manager-dispatcher.init index 2f386b2b..4384f18c 100644 --- a/debian/network-manager.network-manager-dispatcher.init +++ b/debian/network-manager.network-manager-dispatcher.init @@ -1,12 +1,12 @@ #! /bin/sh ### BEGIN INIT INFO # Provides: NetworkManagerDispatcher -# Required-Start: $local_fs -# Required-Stop: $local_fs +# Required-Start: $remote_fs +# Required-Stop: $remote_fs # Should-Start: $syslog # Should-Stop: $syslog # Default-Start: 2 3 4 5 -# Default-Stop: S 0 1 6 +# Default-Stop: 0 1 6 # Short-Description: network events dispatcher # Description: This daemon automatically runs scripts when # NetworkManager changes the network state. @@ -28,7 +28,6 @@ test -x $DAEMON || exit 0 . /lib/lsb/init-functions -test -f /etc/default/rcS && . /etc/default/rcS test -f /etc/default/NetworkManagerDispatcher && . /etc/default/NetworkManagerDispatcher # @@ -41,7 +40,7 @@ d_start() { fi start-stop-daemon --start --quiet --pidfile $PIDFILE \ - --user $USER --exec $DAEMON -- $DAEMON_OPTS --pid-file $PIDFILE + --oknodo --user $USER --exec $DAEMON -- $DAEMON_OPTS --pid-file $PIDFILE } @@ -49,7 +48,7 @@ d_start() { # Function that stops the daemon/service. # d_stop() { - start-stop-daemon --stop --retry 60 --quiet --pidfile $PIDFILE \ + start-stop-daemon --stop --retry 5 --quiet --pidfile $PIDFILE \ --oknodo --user $USER --exec $DAEMON } |