From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 28 Apr 2021 07:48:06 +0000 (+0200)
Subject: logind: use new sd_device_trigger() API
X-Git-Tag: v249-rc1~334^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d8021ea1da6cf1194e89c36e0d025e3262dcabe1;p=thirdparty%2Fsystemd.git

logind: use new sd_device_trigger() API

This is a follow-up for 21012e20a4f0b939d449ad31d9bcbeafdfb8b931 and
related commits, i.e. one more occasion we can use the
sd_device_trigger() API.
---

diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c
index feeacc2d997..3eb0e8fd4e7 100644
--- a/src/login/logind-dbus.c
+++ b/src/login/logind-dbus.c
@@ -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;