logind/machined: properly notice when units are gc'ed

2 files changed, 33 insertions, 1 deletions

diff --git a/src/machine/machined-dbus.c b/src/machine/machined-dbus.c
index a81f37c5ca..1b1eb3a333 100644
--- a/src/machine/machined-dbus.c
+++ b/src/machine/machined-dbus.c
@@ -531,7 +531,6 @@ DBusHandlerResult bus_message_filter(
                         goto finish;
                 }
 
-
                 mm = hashmap_get(m->machine_units, unit);
                 if (mm) {
                         if (streq_ptr(path, mm->scope_job)) {
@@ -570,6 +569,27 @@ DBusHandlerResult bus_message_filter(
                         if (mm)
                                 machine_add_to_gc_queue(mm);
                 }
+
+        } else if (dbus_message_is_signal(message, "org.freedesktop.systemd1.Manager", "UnitRemoved")) {
+                const char *path, *unit;
+                Machine *mm;
+
+                if (!dbus_message_get_args(message, &error,
+                                           DBUS_TYPE_STRING, &unit,
+                                           DBUS_TYPE_OBJECT_PATH, &path,
+                                           DBUS_TYPE_INVALID)) {
+                        log_error("Failed to parse UnitRemoved message: %s", bus_error_message(&error));
+                        goto finish;
+                }
+
+                mm = hashmap_get(m->machine_units, unit);
+                if (mm) {
+                        hashmap_remove(m->machine_units, mm->scope);
+                        free(mm->scope);
+                        mm->scope = NULL;
+
+                        machine_add_to_gc_queue(mm);
+                }
         }
 
 finish:
diff --git a/src/machine/machined.c b/src/machine/machined.c
index 86f8de9195..f2803a18c9 100644
--- a/src/machine/machined.c
+++ b/src/machine/machined.c
@@ -213,6 +213,18 @@ static int manager_connect_bus(Manager *m) {
         dbus_bus_add_match(m->bus,
                            "type='signal',"
                            "sender='org.freedesktop.systemd1',"
+                           "interface='org.freedesktop.systemd1.Manager',"
+                           "member='UnitRemoved',"
+                           "path='/org/freedesktop/systemd1'",
+                           &error);
+        if (dbus_error_is_set(&error)) {
+                log_error("Failed to add match for UnitRemoved: %s", bus_error_message(&error));
+                dbus_error_free(&error);
+        }
+
+        dbus_bus_add_match(m->bus,
+                           "type='signal',"
+                           "sender='org.freedesktop.systemd1',"
                            "interface='org.freedesktop.DBus.Properties',"
                            "member='PropertiesChanged'",
                            &error);