diff options
| author | Michael Biebl <biebl@debian.org> | 2019-04-21 21:23:11 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2019-04-21 21:23:11 +0200 |
| commit | 635386d222a63f74c09d0d0639cf27723e94b3ef (patch) | |
| tree | ef508bc902ff150620d26869fd2ce25803c80b33 | |
| parent | 37a1a6f27003011882d575fc6b47c2dd41d9b46d (diff) | |
Rebase patches
| -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 dc3c2ba7..7b9e28c2 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 0bf6a75..46ced5b 100644 +index 40e068a..bd197fe 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -61,6 +61,8 @@ @@ -35,7 +35,7 @@ index 0bf6a75..46ced5b 100644 guint timestamp_update_id; guint devices_inited_id; -@@ -1430,6 +1436,27 @@ find_best_device_state (NMManager *manager) +@@ -1432,6 +1438,27 @@ find_best_device_state (NMManager *manager) return best_state; } @@ -63,7 +63,7 @@ index 0bf6a75..46ced5b 100644 static void nm_manager_update_metered (NMManager *self) { -@@ -1476,6 +1503,9 @@ nm_manager_update_state (NMManager *self) +@@ -1478,6 +1505,9 @@ nm_manager_update_state (NMManager *self) else new_state = find_best_device_state (self); @@ -73,7 +73,7 @@ index 0bf6a75..46ced5b 100644 if ( new_state >= NM_STATE_CONNECTED_LOCAL && priv->connectivity_state == NM_CONNECTIVITY_FULL) { new_state = NM_STATE_CONNECTED_GLOBAL; -@@ -6481,6 +6511,62 @@ impl_manager_check_connectivity (NMDBusObject *obj, +@@ -6498,6 +6528,62 @@ impl_manager_check_connectivity (NMDBusObject *obj, nm_auth_chain_add_call (chain, NM_AUTH_PERMISSION_NETWORK_CONTROL, TRUE); } @@ -136,7 +136,7 @@ index 0bf6a75..46ced5b 100644 static void start_factory (NMDeviceFactory *factory, gpointer user_data) { -@@ -6649,6 +6735,9 @@ nm_manager_start (NMManager *self, GError **error) +@@ -6666,6 +6752,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 0bf6a75..46ced5b 100644 return TRUE; } -@@ -7508,6 +7597,22 @@ nm_manager_init (NMManager *self) +@@ -7525,6 +7614,22 @@ nm_manager_init (NMManager *self) KERNEL_FIRMWARE_DIR); } @@ -169,7 +169,7 @@ index 0bf6a75..46ced5b 100644 /* Update timestamps in active connections */ priv->timestamp_update_id = g_timeout_add_seconds (300, (GSourceFunc) periodic_update_active_connection_timestamps, self); -@@ -7783,6 +7888,16 @@ dispose (GObject *object) +@@ -7800,6 +7905,16 @@ dispose (GObject *object) g_clear_object (&priv->fw_monitor); } |