diff options
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | debian/patches/03-systemd.patch | 8 | ||||
| -rw-r--r-- | debian/patches/04-systemd-set-kill-mode-process.patch | 27 | ||||
| -rw-r--r-- | debian/patches/05-force-online-with-unmanaged-devices.patch | 18 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
5 files changed, 15 insertions, 40 deletions
diff --git a/debian/changelog b/debian/changelog index 3b98e1c9..008f3f92 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ network-manager (0.9.7.995-1) UNRELEASED; urgency=low * New upstream release (0.9.8 beta1). * Update symbols files. * Use new distro-agnostic configure flags. + * Drop 04-systemd-set-kill-mode-process.patch, refresh other patches. -- Michael Biebl <biebl@debian.org> Sun, 03 Feb 2013 14:49:46 +0100 diff --git a/debian/patches/03-systemd.patch b/debian/patches/03-systemd.patch index 927ec60e..ed1da53d 100644 --- a/debian/patches/03-systemd.patch +++ b/debian/patches/03-systemd.patch @@ -6,8 +6,8 @@ Description: Debian specific tweaks for NetworkManager systemd service file Author: Michael Biebl <biebl@debian.org> Index: network-manager/data/NetworkManager.service.in =================================================================== ---- network-manager.orig/data/NetworkManager.service.in 2012-03-02 21:43:15.458064485 +0100 -+++ network-manager/data/NetworkManager.service.in 2012-03-02 21:43:20.242064316 +0100 +--- network-manager.orig/data/NetworkManager.service.in 2013-01-29 20:14:47.671547402 +0100 ++++ network-manager/data/NetworkManager.service.in 2013-01-29 20:15:03.927722604 +0100 @@ -1,8 +1,6 @@ [Unit] Description=Network Manager @@ -17,8 +17,10 @@ Index: network-manager/data/NetworkManager.service.in [Service] Type=dbus -@@ -16,3 +14,4 @@ +@@ -18,5 +16,6 @@ [Install] WantedBy=multi-user.target Alias=dbus-org.freedesktop.NetworkManager.service +Alias=network-manager.service + Also=NetworkManager-wait-online.service + diff --git a/debian/patches/04-systemd-set-kill-mode-process.patch b/debian/patches/04-systemd-set-kill-mode-process.patch deleted file mode 100644 index daed7aef..00000000 --- a/debian/patches/04-systemd-set-kill-mode-process.patch +++ /dev/null @@ -1,27 +0,0 @@ -commit 1d89bc0004ec27fbc0c89f17861118c78d7eeab5 (HEAD, origin/master, origin/HEAD, master) -Author: Dan Winship <danw@gnome.org> -Date: Fri Jan 4 11:53:03 2013 -0500 - - systemd: set KillMode=process - - By default, when shutting NM down, systemd will kill everything in its - cgroup. But this can cause problems (eg, NM thinking that dhclient - crashed and then taking down an interface that it would otherwise have - left up). Fix this by setting KillMode=process, which tells systemd to - only kill NM itself, and let NM kill its children. - - https://bugzilla.redhat.com/show_bug.cgi?id=876218 - -Index: network-manager/data/NetworkManager.service.in -=================================================================== ---- network-manager.orig/data/NetworkManager.service.in 2013-01-05 20:18:09.943472117 +0100 -+++ network-manager/data/NetworkManager.service.in 2013-01-05 20:18:09.943472117 +0100 -@@ -10,6 +10,8 @@ - # with LOG_PERROR when run in foreground. But systemd redirects stderr to - # syslog by default, which results in logging each message twice. - StandardError=null -+# NM doesn't want systemd to kill its children for it -+KillMode=process - - [Install] - WantedBy=multi-user.target diff --git a/debian/patches/05-force-online-with-unmanaged-devices.patch b/debian/patches/05-force-online-with-unmanaged-devices.patch index 08889cd0..c542457e 100644 --- a/debian/patches/05-force-online-with-unmanaged-devices.patch +++ b/debian/patches/05-force-online-with-unmanaged-devices.patch @@ -6,18 +6,18 @@ Author: Michael Biebl <biebl@debian.org> Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=512286 Index: network-manager/src/nm-manager.c =================================================================== ---- network-manager.orig/src/nm-manager.c 2013-01-29 04:32:04.443486952 +0100 -+++ network-manager/src/nm-manager.c 2013-01-29 04:32:04.439486915 +0100 +--- network-manager.orig/src/nm-manager.c 2013-01-29 20:15:17.955873772 +0100 ++++ network-manager/src/nm-manager.c 2013-01-29 20:15:17.951873729 +0100 @@ -80,6 +80,8 @@ - - #define UPOWER_DBUS_SERVICE "org.freedesktop.UPower" + #define NM_AUTOIP_DBUS_SERVICE "org.freedesktop.nm_avahi_autoipd" + #define NM_AUTOIP_DBUS_IFACE "org.freedesktop.nm_avahi_autoipd" +#define IFUPDOWN_STATE_FILE "/run/network/ifstate" + static gboolean impl_manager_get_devices (NMManager *manager, GPtrArray **devices, GError **err); -@@ -236,6 +238,11 @@ +@@ -242,6 +244,11 @@ guint fw_monitor_id; guint fw_changed_id; @@ -29,7 +29,7 @@ Index: network-manager/src/nm-manager.c guint timestamp_update_id; gboolean disposed; -@@ -448,6 +455,14 @@ +@@ -533,6 +540,14 @@ break; } @@ -44,7 +44,7 @@ Index: network-manager/src/nm-manager.c if (nm_device_is_activating (dev)) new_state = NM_STATE_CONNECTING; else if (new_state != NM_STATE_CONNECTING) { -@@ -3655,6 +3670,65 @@ +@@ -3717,6 +3732,65 @@ } } @@ -110,7 +110,7 @@ Index: network-manager/src/nm-manager.c #define NM_PERM_DENIED_ERROR "org.freedesktop.NetworkManager.PermissionDenied" #define DEV_PERM_DENIED_ERROR "org.freedesktop.NetworkManager.Device.PermissionDenied" -@@ -4050,6 +4124,17 @@ +@@ -4115,6 +4189,17 @@ g_object_unref (priv->fw_monitor); } @@ -128,7 +128,7 @@ Index: network-manager/src/nm-manager.c g_slist_free (priv->factories); if (priv->timestamp_update_id) { -@@ -4398,6 +4483,23 @@ +@@ -4443,6 +4528,23 @@ KERNEL_FIRMWARE_DIR); } diff --git a/debian/patches/series b/debian/patches/series index 699dc10f..69e54131 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,4 @@ # Debian patches for network-manager 02-dbus_access_network_manager.patch 03-systemd.patch -04-systemd-set-kill-mode-process.patch 05-force-online-with-unmanaged-devices.patch |