From: Mike Yuan <me@yhndnzj.com>
Date: Mon, 13 Jan 2025 16:30:51 +0000 (+0100)
Subject: core/manager: restore bus track deserialization cleanup in manager_reload()
X-Git-Tag: v258-rc1~1622^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F35970%2Fhead;p=thirdparty%2Fsystemd.git

core/manager: restore bus track deserialization cleanup in manager_reload()

There's zero explanation why it got (spuriously) removed in
8402ca04d1a063c3d8a9e3d5c16df8bb8778ae98...
---

diff --git a/src/core/manager.c b/src/core/manager.c
index b749b0e1cab..8f1dc626c2c 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -3801,6 +3801,11 @@ int manager_reload(Manager *m) {
         (void) manager_setup_handoff_timestamp_fd(m);
         (void) manager_setup_pidref_transport_fd(m);
 
+        /* Clean up deserialized bus track information. They're never consumed during reload (as opposed to
+         * reexec) since we do not disconnect from the bus. */
+        m->subscribed_as_strv = strv_free(m->subscribed_as_strv);
+        m->deserialized_bus_id = SD_ID128_NULL;
+
         /* Third, fire things up! */
         manager_coldplug(m);