]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
logind: use new sd_device_trigger() API
authorLennart Poettering <lennart@poettering.net>
Wed, 28 Apr 2021 07:48:06 +0000 (09:48 +0200)
committerLennart Poettering <lennart@poettering.net>
Wed, 28 Apr 2021 07:48:42 +0000 (09:48 +0200)
This is a follow-up for 21012e20a4f0b939d449ad31d9bcbeafdfb8b931 and
related commits, i.e. one more occasion we can use the
sd_device_trigger() API.

src/login/logind-dbus.c

index feeacc2d9971ba54ad3811b80a5125bd8b2cbf16..3eb0e8fd4e7f29bcd26b86674ba293d4c9a55d95 100644 (file)
@@ -1319,18 +1319,9 @@ static int trigger_device(Manager *m, sd_device *d) {
         }
 
         FOREACH_DEVICE(e, d) {
-                _cleanup_free_ char *t = NULL;
-                const char *p;
-
-                r = sd_device_get_syspath(d, &p);
+                r = sd_device_trigger(d, SD_DEVICE_CHANGE);
                 if (r < 0)
-                        return r;
-
-                t = path_join(p, "uevent");
-                if (!t)
-                        return -ENOMEM;
-
-                (void) write_string_file(t, "change", WRITE_STRING_FILE_DISABLE_BUFFER);
+                        log_device_debug_errno(d, r, "Failed to trigger device, ignoring: %m");
         }
 
         return 0;