diff options
| -rw-r--r-- | debian/patches/Don-t-setup-Sleep-Monitor-if-not-booted-with-systemd.patch | 6 | ||||
| -rw-r--r-- | debian/patches/Force-online-state-with-unmanaged-devices.patch | 18 |
2 files changed, 12 insertions, 12 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 index 7d869e6f..7252cb85 100644 --- 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 @@ -16,10 +16,10 @@ Closes: #742933 1 file changed, 5 insertions(+) diff --git a/src/nm-sleep-monitor.c b/src/nm-sleep-monitor.c -index 7e0ebe6..aa694d5 100644 +index c97f6f7..5ea0a64 100644 --- a/src/nm-sleep-monitor.c +++ b/src/nm-sleep-monitor.c -@@ -23,6 +23,7 @@ +@@ -22,6 +22,7 @@ #include <sys/stat.h> #include <gio/gunixfdlist.h> @@ -27,7 +27,7 @@ index 7e0ebe6..aa694d5 100644 #include "nm-core-internal.h" #include "NetworkManagerUtils.h" -@@ -342,6 +343,10 @@ on_proxy_acquired (GObject *object, +@@ -341,6 +342,10 @@ on_proxy_acquired (GObject *object, static void nm_sleep_monitor_init (NMSleepMonitor *self) { diff --git a/debian/patches/Force-online-state-with-unmanaged-devices.patch b/debian/patches/Force-online-state-with-unmanaged-devices.patch index 7b9e28c2..fec62572 100644 --- a/debian/patches/Force-online-state-with-unmanaged-devices.patch +++ b/debian/patches/Force-online-state-with-unmanaged-devices.patch @@ -12,10 +12,10 @@ 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 40e068a..bd197fe 100644 +index 6ea5350..b1308a0 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c -@@ -61,6 +61,8 @@ +@@ -60,6 +60,8 @@ #include "nm-dispatcher.h" #include "NetworkManagerUtils.h" @@ -24,7 +24,7 @@ index 40e068a..bd197fe 100644 /*****************************************************************************/ typedef struct { -@@ -193,6 +195,10 @@ typedef struct { +@@ -198,6 +200,10 @@ typedef struct { GFileMonitor *fw_monitor; guint fw_changed_id; @@ -35,7 +35,7 @@ index 40e068a..bd197fe 100644 guint timestamp_update_id; guint devices_inited_id; -@@ -1432,6 +1438,27 @@ find_best_device_state (NMManager *manager) +@@ -1436,6 +1442,27 @@ find_best_device_state (NMManager *manager) return best_state; } @@ -63,7 +63,7 @@ index 40e068a..bd197fe 100644 static void nm_manager_update_metered (NMManager *self) { -@@ -1478,6 +1505,9 @@ nm_manager_update_state (NMManager *self) +@@ -1482,6 +1509,9 @@ nm_manager_update_state (NMManager *self) else new_state = find_best_device_state (self); @@ -73,7 +73,7 @@ index 40e068a..bd197fe 100644 if ( new_state >= NM_STATE_CONNECTED_LOCAL && priv->connectivity_state == NM_CONNECTIVITY_FULL) { new_state = NM_STATE_CONNECTED_GLOBAL; -@@ -6498,6 +6528,62 @@ impl_manager_check_connectivity (NMDBusObject *obj, +@@ -6452,6 +6482,62 @@ impl_manager_check_connectivity (NMDBusObject *obj, nm_auth_chain_add_call (chain, NM_AUTH_PERMISSION_NETWORK_CONTROL, TRUE); } @@ -136,7 +136,7 @@ index 40e068a..bd197fe 100644 static void start_factory (NMDeviceFactory *factory, gpointer user_data) { -@@ -6666,6 +6752,9 @@ nm_manager_start (NMManager *self, GError **error) +@@ -6625,6 +6711,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 40e068a..bd197fe 100644 return TRUE; } -@@ -7525,6 +7614,22 @@ nm_manager_init (NMManager *self) +@@ -7473,6 +7562,22 @@ nm_manager_init (NMManager *self) KERNEL_FIRMWARE_DIR); } @@ -169,7 +169,7 @@ index 40e068a..bd197fe 100644 /* Update timestamps in active connections */ priv->timestamp_update_id = g_timeout_add_seconds (300, (GSourceFunc) periodic_update_active_connection_timestamps, self); -@@ -7800,6 +7905,16 @@ dispose (GObject *object) +@@ -7755,6 +7860,16 @@ dispose (GObject *object) g_clear_object (&priv->fw_monitor); } |