Merge pull request #15265 from fbuihuu/mount-fixes

[thirdparty/systemd.git] / src / core / device.c

diff --git a/src/core/device.c b/src/core/device.c
index 45149e75554c9243b299f93a6ebf8b7d43d2320f..50d55289fa88db5c7c9e1aa102d2a732bb000f9d 100644 (file)
--- a/src/core/device.c
+++ b/src/core/device.c
@@ -83,6 +83,8 @@ static int device_set_sysfs(Device *d, const char *sysfs) {
         }
 
         d->sysfs = TAKE_PTR(copy);
+        unit_add_to_dbus_queue(UNIT(d));
+
         return 0;
 }
 
@@ -562,9 +564,6 @@ static int device_setup_unit(Manager *m, sd_device *dev, const char *path, bool
         if (dev && device_is_bound_by_mounts(DEVICE(u), dev))
                 device_upgrade_mount_deps(u);
 
-        /* Note that this won't dispatch the load queue, the caller has to do that if needed and appropriate */
-        unit_add_to_dbus_queue(u);
-
         return 0;
 
 fail:
@@ -1081,8 +1080,6 @@ const UnitVTable device_vtable = {
         .active_state = device_active_state,
         .sub_state_to_string = device_sub_state_to_string,
 
-        .bus_vtable = bus_device_vtable,
-
         .following = device_following,
         .following_set = device_following_set,