diff options
Diffstat (limited to 'debian/patches')
4 files changed, 15 insertions, 56 deletions
diff --git a/debian/patches/Don-t-setup-Sleep-Monitor-if-not-booted-with-systemd.patch b/debian/patches/Don-t-setup-Sleep-Monitor-if-not-booted-with-systemd.patch deleted file mode 100644 index 098e89d7..00000000 --- a/debian/patches/Don-t-setup-Sleep-Monitor-if-not-booted-with-systemd.patch +++ /dev/null @@ -1,40 +0,0 @@ -From: Michael Biebl <biebl@debian.org> -Date: Sat, 12 Apr 2014 12:38:09 +0200 -Subject: Don't setup Sleep Monitor if not booted with systemd - -NetworkManager uses systemd for suspend/resume support. It listens for -the PrepareForSleep and Resume D-Bus signal sent by logind/systemd and -deactivates the interfaces on sleep and reactivates them on resume. -With a standalone logind we don't get a Resume signal and -NetworkManager remains in sleep mode where the devices are unmanaged. -As a workaround, skip the Sleep Monitor setup if not booted with -systemd. - -Closes: #742933 ---- - src/nm-sleep-monitor.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/src/nm-sleep-monitor.c b/src/nm-sleep-monitor.c -index c16dc07..cb2ca21 100644 ---- a/src/nm-sleep-monitor.c -+++ b/src/nm-sleep-monitor.c -@@ -10,6 +10,7 @@ - - #include <sys/stat.h> - #include <gio/gunixfdlist.h> -+#include <systemd/sd-daemon.h> - - #include "nm-core-internal.h" - #include "NetworkManagerUtils.h" -@@ -329,6 +330,10 @@ on_proxy_acquired (GObject *object, - static void - nm_sleep_monitor_init (NMSleepMonitor *self) - { -+ if (!sd_booted()) { -+ nm_log_warn (LOGD_SUSPEND, "Skipping Sleep Monitor setup, system not booted with systemd"); -+ return; -+ } - self->inhibit_fd = -1; - self->cancellable = g_cancellable_new (); - g_dbus_proxy_new_for_bus (G_BUS_TYPE_SYSTEM, diff --git a/debian/patches/Force-online-state-with-unmanaged-devices.patch b/debian/patches/Force-online-state-with-unmanaged-devices.patch index c16fee62..776e9a95 100644 --- a/debian/patches/Force-online-state-with-unmanaged-devices.patch +++ b/debian/patches/Force-online-state-with-unmanaged-devices.patch @@ -12,7 +12,7 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=512286 1 file changed, 115 insertions(+) diff --git a/src/nm-manager.c b/src/nm-manager.c -index d7b2211..a89a8b7 100644 +index bbe5012..b303ec4 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -52,6 +52,8 @@ @@ -35,7 +35,7 @@ index d7b2211..a89a8b7 100644 guint timestamp_update_id; guint devices_inited_id; -@@ -1427,6 +1433,27 @@ find_best_device_state (NMManager *manager) +@@ -1428,6 +1434,27 @@ find_best_device_state (NMManager *manager) return best_state; } @@ -63,7 +63,7 @@ index d7b2211..a89a8b7 100644 static void nm_manager_update_metered (NMManager *self) { -@@ -1473,6 +1500,9 @@ nm_manager_update_state (NMManager *self) +@@ -1474,6 +1501,9 @@ nm_manager_update_state (NMManager *self) else new_state = find_best_device_state (self); @@ -73,7 +73,7 @@ index d7b2211..a89a8b7 100644 if ( new_state >= NM_STATE_CONNECTED_LOCAL && priv->connectivity_state == NM_CONNECTIVITY_FULL) { new_state = NM_STATE_CONNECTED_GLOBAL; -@@ -6525,6 +6555,62 @@ impl_manager_check_connectivity (NMDBusObject *obj, +@@ -6534,6 +6564,62 @@ impl_manager_check_connectivity (NMDBusObject *obj, nm_auth_chain_add_call (chain, NM_AUTH_PERMISSION_NETWORK_CONTROL, TRUE); } @@ -136,7 +136,7 @@ index d7b2211..a89a8b7 100644 static void start_factory (NMDeviceFactory *factory, gpointer user_data) { -@@ -6706,6 +6792,9 @@ nm_manager_start (NMManager *self, GError **error) +@@ -6715,6 +6801,9 @@ nm_manager_start (NMManager *self, GError **error) nm_clear_g_source (&priv->devices_inited_id); priv->devices_inited_id = g_idle_add_full (G_PRIORITY_LOW + 10, devices_inited_cb, self, NULL); @@ -146,7 +146,7 @@ index d7b2211..a89a8b7 100644 return TRUE; } -@@ -7553,6 +7642,22 @@ nm_manager_init (NMManager *self) +@@ -7562,6 +7651,22 @@ nm_manager_init (NMManager *self) KERNEL_FIRMWARE_DIR); } @@ -169,7 +169,7 @@ index d7b2211..a89a8b7 100644 /* Update timestamps in active connections */ priv->timestamp_update_id = g_timeout_add_seconds (300, (GSourceFunc) periodic_update_active_connection_timestamps, self); -@@ -7832,6 +7937,16 @@ dispose (GObject *object) +@@ -7841,6 +7946,16 @@ dispose (GObject *object) g_clear_object (&priv->fw_monitor); } diff --git a/debian/patches/Update-dnsmasq-parameters.patch b/debian/patches/Update-dnsmasq-parameters.patch index 9787e983..c0f97963 100644 --- a/debian/patches/Update-dnsmasq-parameters.patch +++ b/debian/patches/Update-dnsmasq-parameters.patch @@ -10,10 +10,10 @@ See also: https://blueprints.launchpad.net/ubuntu/+spec/foundations-p-dns-resolv src/dns/nm-dns-manager.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) -Index: network-manager-1.22.2/src/dns/nm-dns-dnsmasq.c +Index: network-manager-1.24.0/src/dns/nm-dns-dnsmasq.c =================================================================== ---- network-manager-1.22.2.orig/src/dns/nm-dns-dnsmasq.c -+++ network-manager-1.22.2/src/dns/nm-dns-dnsmasq.c +--- network-manager-1.24.0.orig/src/dns/nm-dns-dnsmasq.c ++++ network-manager-1.24.0/src/dns/nm-dns-dnsmasq.c @@ -494,8 +494,8 @@ _gl_pid_spawn_next_step (void) argv[argv_idx++] = "--no-hosts"; /* don't use /etc/hosts to resolve */ argv[argv_idx++] = "--bind-interfaces"; @@ -25,11 +25,11 @@ Index: network-manager-1.22.2/src/dns/nm-dns-dnsmasq.c argv[argv_idx++] = "--clear-on-reload"; /* clear cache when dns server changes */ argv[argv_idx++] = "--conf-file=/dev/null"; /* avoid loading /etc/dnsmasq.conf */ argv[argv_idx++] = "--proxy-dnssec"; /* Allow DNSSEC to pass through */ -Index: network-manager-1.22.2/src/dns/nm-dns-manager.c +Index: network-manager-1.24.0/src/dns/nm-dns-manager.c =================================================================== ---- network-manager-1.22.2.orig/src/dns/nm-dns-manager.c -+++ network-manager-1.22.2/src/dns/nm-dns-manager.c -@@ -1469,12 +1469,12 @@ update_dns (NMDnsManager *self, +--- network-manager-1.24.0.orig/src/dns/nm-dns-manager.c ++++ network-manager-1.24.0/src/dns/nm-dns-manager.c +@@ -1526,12 +1526,12 @@ plugin_skip: NM_CAST_STRV_CC (nameservers), NM_CAST_STRV_CC (options)); @@ -44,7 +44,7 @@ Index: network-manager-1.22.2/src/dns/nm-dns-manager.c if (NM_IS_DNS_SYSTEMD_RESOLVED (priv->plugin)) { /* systemd-resolved uses a different link-local address */ -@@ -1757,7 +1757,7 @@ nm_dns_manager_stop (NMDnsManager *self) +@@ -1825,7 +1825,7 @@ nm_dns_manager_stop (NMDnsManager *self) _LOGT ("stopping..."); /* If we're quitting, leave a valid resolv.conf in place, not one diff --git a/debian/patches/series b/debian/patches/series index f8150736..c25f5936 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,4 @@ Force-online-state-with-unmanaged-devices.patch -Don-t-setup-Sleep-Monitor-if-not-booted-with-systemd.patch # Ubuntu patches Provide-access-to-some-of-NM-s-interfaces-to-whoopsie.patch |