Skip to content

Commit

Permalink
core/manager: restore bus track deserialization cleanup in manager_re…
Browse files Browse the repository at this point in the history
…load()

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

(cherry picked from commit 34f4b817f67b002eae7e2c09b19bf4b66c4791b6)

Resolves: RHEL-73780
  • Loading branch information
YHNdnzj authored and jamacku committed Jan 17, 2025
1 parent 905304b commit e7c3e99
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions src/core/manager.c
Original file line number Diff line number Diff line change
Expand Up @@ -3805,6 +3805,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);

Expand Down

0 comments on commit e7c3e99

Please sign in to comment.