mirror of
https://github.com/morgan9e/systemd
synced 2026-04-14 08:25:20 +09:00
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.
This commit is contained in:
committed by
Yu Watanabe
parent
6c498f6d89
commit
6f2ef23a4e
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user