diff options
| author | Michael Biebl <biebl@debian.org> | 2025-02-27 22:38:46 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2025-02-27 22:38:46 +0100 |
| commit | 05acc158a3a4dddbdb4aaba52b42d4a355f2ac98 (patch) | |
| tree | 2b6eda81cf53db5d7a4fbb10d011b532b3b33d79 | |
| parent | 3f1570ae76ab56351153b19661d4a8845bd90826 (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 d38df50d..ac6505b0 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 b96a905..67deb1b 100644 +index 0328540..40be30f 100644 --- a/src/core/nm-manager.c +++ b/src/core/nm-manager.c @@ -53,6 +53,8 @@ @@ -73,7 +73,7 @@ index b96a905..67deb1b 100644 if (new_state >= NM_STATE_CONNECTED_LOCAL && priv->connectivity_state == NM_CONNECTIVITY_FULL) { new_state = NM_STATE_CONNECTED_GLOBAL; } -@@ -7785,6 +7815,62 @@ impl_manager_get_logging(NMDBusObject *obj, +@@ -7795,6 +7825,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 b96a905..67deb1b 100644 typedef struct { NMManager *self; GDBusMethodInvocation *context; -@@ -8089,6 +8175,9 @@ nm_manager_start(NMManager *self, GError **error) +@@ -8099,6 +8185,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 b96a905..67deb1b 100644 return TRUE; } -@@ -8974,6 +9063,22 @@ nm_manager_init(NMManager *self) +@@ -8984,6 +9073,22 @@ nm_manager_init(NMManager *self) _LOGW(LOGD_CORE, "failed to monitor kernel firmware directory '%s'.", KERNEL_FIRMWARE_DIR); } @@ -169,7 +169,7 @@ index b96a905..67deb1b 100644 priv->metered = NM_METERED_UNKNOWN; priv->sleep_devices = g_hash_table_new(nm_direct_hash, NULL); } -@@ -9265,6 +9370,16 @@ dispose(GObject *object) +@@ -9275,6 +9380,16 @@ dispose(GObject *object) g_clear_object(&priv->fw_monitor); } |