diff options
| author | Michael Biebl <biebl@debian.org> | 2024-07-26 01:23:38 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2024-07-26 01:23:38 +0200 |
| commit | 5617e4c253f0c20859155cc60ba5e7ad742f8595 (patch) | |
| tree | 3ae16cc7c80ae19965b5db8d0bd518506de8da9e | |
| parent | 347e31bf5891d5b9e356598bef07680cac11eda9 (diff) | |
Rebase patches
| -rw-r--r-- | debian/patches/Force-online-state-with-unmanaged-devices.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/debian/patches/Force-online-state-with-unmanaged-devices.patch b/debian/patches/Force-online-state-with-unmanaged-devices.patch index 02c60038..05633b51 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/core/nm-manager.c b/src/core/nm-manager.c -index ddbd202..5143298 100644 +index e949ea1..47ba86e 100644 --- a/src/core/nm-manager.c +++ b/src/core/nm-manager.c @@ -53,6 +53,8 @@ @@ -73,7 +73,7 @@ index ddbd202..5143298 100644 if (new_state >= NM_STATE_CONNECTED_LOCAL && priv->connectivity_state == NM_CONNECTIVITY_FULL) { new_state = NM_STATE_CONNECTED_GLOBAL; } -@@ -7757,6 +7787,62 @@ impl_manager_get_logging(NMDBusObject *obj, +@@ -7763,6 +7793,62 @@ impl_manager_get_logging(NMDBusObject *obj, g_variant_new("(ss)", nm_logging_level_to_string(), nm_logging_domains_to_string())); } @@ -136,7 +136,7 @@ index ddbd202..5143298 100644 typedef struct { NMManager *self; GDBusMethodInvocation *context; -@@ -8061,6 +8147,9 @@ nm_manager_start(NMManager *self, GError **error) +@@ -8067,6 +8153,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 ddbd202..5143298 100644 return TRUE; } -@@ -8946,6 +9035,22 @@ nm_manager_init(NMManager *self) +@@ -8952,6 +9041,22 @@ nm_manager_init(NMManager *self) _LOGW(LOGD_CORE, "failed to monitor kernel firmware directory '%s'.", KERNEL_FIRMWARE_DIR); } @@ -169,7 +169,7 @@ index ddbd202..5143298 100644 priv->metered = NM_METERED_UNKNOWN; priv->sleep_devices = g_hash_table_new(nm_direct_hash, NULL); } -@@ -9237,6 +9342,16 @@ dispose(GObject *object) +@@ -9243,6 +9348,16 @@ dispose(GObject *object) g_clear_object(&priv->fw_monitor); } |