From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 31 May 2021 20:56:02 +0000 (+0200)
Subject: udevadm: output trigger UUID in UUID format, instead of ID128
X-Git-Tag: v249-rc1~125
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6f2ef23a4e1a83f5d488c09983c7e9bd008d7a8d;p=thirdparty%2Fsystemd.git

udevadm: output trigger UUID in UUID format, instead of ID128

The SYNTH_UUID property also shows it in UUID format, and so does the
kernel and its docs otherwise, hence accept our fate and also output it
in UUID.
---

diff --git a/src/udev/udevadm-trigger.c b/src/udev/udevadm-trigger.c
index c75445959e6..dc68f38d033 100644
--- a/src/udev/udevadm-trigger.c
+++ b/src/udev/udevadm-trigger.c
@@ -109,7 +109,7 @@ static int exec_list(
 
                 /* If the user asked for it, write event UUID to stdout */
                 if (arg_uuid)
-                        printf(SD_ID128_FORMAT_STR "\n", SD_ID128_FORMAT_VAL(id));
+                        printf(SD_ID128_UUID_FORMAT_STR "\n", SD_ID128_FORMAT_VAL(id));
 
                 if (settle_hashmap) {
                         _cleanup_free_ sd_id128_t *mid = NULL;
@@ -175,7 +175,7 @@ static int device_monitor_handler(sd_device_monitor *m, sd_device *dev, void *us
                 printf("settle %s\n", syspath);
 
         if (arg_uuid)
-                printf("settle " SD_ID128_FORMAT_STR "\n", SD_ID128_FORMAT_VAL(*settle_id));
+                printf("settle " SD_ID128_UUID_FORMAT_STR "\n", SD_ID128_FORMAT_VAL(*settle_id));
 
         free(hashmap_remove(settle_hashmap, syspath));
         free(k);