diff options
| author | Michael Biebl <biebl@debian.org> | 2020-04-11 21:33:56 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2020-04-11 21:33:56 +0200 |
| commit | 236b86c72988eb4e015883e524805585572b68ee (patch) | |
| tree | a602de49c52b634e3c5359ba47baf98f071ac343 /debian | |
| parent | 37a5485639453c2f2fe2de99c47d1092113cccd2 (diff) | |
Rebase patches
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/patches/Force-online-state-with-unmanaged-devices.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/debian/patches/Force-online-state-with-unmanaged-devices.patch b/debian/patches/Force-online-state-with-unmanaged-devices.patch index c16fee62..e095a4bd 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 1f3ba1f..f449a41 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, +@@ -6495,6 +6525,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) +@@ -6676,6 +6762,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) +@@ -7523,6 +7612,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) +@@ -7802,6 +7907,16 @@ dispose (GObject *object) g_clear_object (&priv->fw_monitor); } |