summaryrefslogtreecommitdiff
path: root/src/veritysetup
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2022-02-14 14:52:02 +0100
committerLennart Poettering <lennart@poettering.net>2022-02-14 15:13:23 +0100
commitb74163607b4e513288d38b7f16e230f5a61400c0 (patch)
tree9a48311cacb1cd135cb40586a24411810ef20672 /src/veritysetup
parentfdf9de694f4c55b8cebd9d749f9c17c4bfb32650 (diff)
downloadsystemd-b74163607b4e513288d38b7f16e230f5a61400c0.tar.gz
sd128: export sd_id128_to_uuid_string()
We expose various other forms of UUID helpers already, i.e. SD_ID128_UUID_FORMAT_STR and SD_ID128_MAKE_UUID_STR(), and we parse UUIDs, hence add a high-level helper for formatting UUIDs too. This doesn't add any new code, it just moves some helpers id128-util.[ch] → sd-id128.[ch], to make them public.
Diffstat (limited to 'src/veritysetup')
-rw-r--r--src/veritysetup/veritysetup-generator.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/veritysetup/veritysetup-generator.c b/src/veritysetup/veritysetup-generator.c
index e38bd04159..74d5580cbc 100644
--- a/src/veritysetup/veritysetup-generator.c
+++ b/src/veritysetup/veritysetup-generator.c
@@ -285,7 +285,7 @@ static int determine_device(
if (!*data_what) {
memcpy(&data_uuid, m, sizeof(data_uuid));
- *data_what = path_join("/dev/disk/by-partuuid", ID128_TO_UUID_STRING(data_uuid));
+ *data_what = path_join("/dev/disk/by-partuuid", SD_ID128_TO_UUID_STRING(data_uuid));
if (!*data_what)
return log_oom();
}
@@ -293,7 +293,7 @@ static int determine_device(
if (!*hash_what) {
memcpy(&verity_uuid, (uint8_t*) m + l - sizeof(verity_uuid), sizeof(verity_uuid));
- *hash_what = path_join("/dev/disk/by-partuuid", ID128_TO_UUID_STRING(verity_uuid));
+ *hash_what = path_join("/dev/disk/by-partuuid", SD_ID128_TO_UUID_STRING(verity_uuid));
if (!*hash_what)
return log_oom();
}