morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-14 08:25:20 +09:00
Code Issues Packages Projects Releases Wiki Activity

id128-util: use FOREACH_STRING where appropriate

Browse Source
This commit is contained in:
Mike Yuan
2024-01-24 17:02:28 +08:00
parent ed4498a193
commit f789041c4a
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/libsystemd/sd-id128/id128-util.c
View File

@@ -12,6 +12,7 @@
#include "sha256.h"
#include "stdio-util.h"
#include "string-util.h"
#include "strv.h"
#include "sync-util.h"
#include "virt.h"
@@ -231,11 +232,15 @@ int id128_get_product(sd_id128_t *ret) {
* of the host */
return -ENOENT;
r = id128_read("/sys/class/dmi/id/product_uuid", ID128_FORMAT_UUID, &uuid);
if (r == -ENOENT)
r = id128_read("/proc/device-tree/vm,uuid", ID128_FORMAT_UUID, &uuid);
if (r == -ENOENT)
r = id128_read("/sys/hypervisor/uuid", ID128_FORMAT_UUID, &uuid);
FOREACH_STRING(i,
"/sys/class/dmi/id/product_uuid", /* KVM */
"/proc/device-tree/vm,uuid", /* Device tree */
"/sys/hypervisor/uuid") { /* Xen */
r = id128_read(i, ID128_FORMAT_UUID, &uuid);
if (r != -ENOENT)
break;
}
if (r < 0)
return r;