diff options
| author | Michael Biebl <biebl@teco.edu> | 2006-02-28 20:43:53 +0000 |
|---|---|---|
| committer | Michael Biebl <biebl@teco.edu> | 2006-02-28 20:43:53 +0000 |
| commit | c1cffd3cc3bad85d1e28a2a8f4cc0fd0e1359bbd (patch) | |
| tree | 4fbf8de35b7189365965aadf6df0da0cfc3d3734 | |
| parent | 28c7a549e99aa2fe3ffcbde69ed537131d6f455e (diff) | |
Do not kill NM prematurely. NM needs some time to shutdown.
git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@683 ceb527fc-18e6-0310-9fe2-813c157c29e7
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | debian/network-manager-gnome.install | 1 | ||||
| -rw-r--r-- | debian/network-manager.dbus-event | 7 | ||||
| -rw-r--r-- | debian/patches/timeout.patch | 11 |
4 files changed, 13 insertions, 8 deletions
diff --git a/debian/control b/debian/control index 4197d537..91b77181 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: net Priority: optional Maintainer: Riccardo Setti <giskard@autistici.org> Uploaders: Michael Biebl <biebl@teco.edu> -Build-Depends: debhelper (>= 5), cdbs, gnome-common, intltool, libgnome-keyring-dev, libdbus-glib-1-dev (>= 0.60), libiw-dev(>= 27+28pre9), libgnomeui-dev, libpanel-applet2-dev, libglade2-dev, libgconf2-dev, libhal-dev (>= 0.5.0), libnl-dev (>= 1.0pre6), docbook-to-man +Build-Depends: debhelper (>= 5), cdbs, gnome-common, intltool, libgnome-keyring-dev, libdbus-glib-1-dev (>= 0.60), libiw-dev(>= 27+28pre9), libgnomeui-dev, libpanel-applet2-dev, libglade2-dev, libgconf2-dev, libhal-dev (>= 0.5.0), libnl-dev (>= 0.99+1.0.svn21), libnotify-dev (>= 0.3), docbook-to-man Standards-Version: 3.6.2 Package: network-manager diff --git a/debian/network-manager-gnome.install b/debian/network-manager-gnome.install index fb749241..dfa048ea 100644 --- a/debian/network-manager-gnome.install +++ b/debian/network-manager-gnome.install @@ -4,5 +4,4 @@ debian/tmp/usr/share/locale/* debian/tmp/usr/share/nm-applet/* debian/tmp/usr/share/icons debian/tmp/usr/share/gnome-vpn-properties -debian/tmp/usr/share/autostart debian/tmp/etc/dbus-1/system.d/nm-applet.conf diff --git a/debian/network-manager.dbus-event b/debian/network-manager.dbus-event index 5556f018..d26d18f4 100644 --- a/debian/network-manager.dbus-event +++ b/debian/network-manager.dbus-event @@ -65,13 +65,8 @@ d_stop() { log_begin_msg "Stopping $DESC" start-stop-daemon --stop --quiet --pidfile $PIDFILE \ --oknodo --user $USER --exec $DAEMON + log_end_msg $? - - # if NetworkManager does not want to die, apply some more force - if [ -e $PIDFILE ]; then - kill -9 $(cat $PIDFILE) || true - rm -f $PIDFILE - fi } diff --git a/debian/patches/timeout.patch b/debian/patches/timeout.patch new file mode 100644 index 00000000..0723c83a --- /dev/null +++ b/debian/patches/timeout.patch @@ -0,0 +1,11 @@ +--- src/nm-device-802-11-wireless.c.orig 2006-02-13 11:46:50.000000000 +0100 ++++ src/nm-device-802-11-wireless.c 2006-02-13 11:47:08.000000000 +0100 +@@ -2205,7 +2205,7 @@ + } + + +-#define NM_SUPPLICANT_TIMEOUT 20 /* how long we wait for wpa_supplicant to associate (in seconds) */ ++#define NM_SUPPLICANT_TIMEOUT 60 /* how long we wait for wpa_supplicant to associate (in seconds) */ + + static unsigned int + get_supplicant_timeout (NMDevice80211Wireless *self) |