From 057bf780e9d45480fbacdd3b060dbe37b37f9693 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Thu, 8 Dec 2022 14:30:31 +0900 Subject: sd-id128: make id128_read() or friends return -ENOPKG when the file contents is "uninitialized" Then, this drops ID128_PLAIN_OR_UNINIT. Also, this renames Id128Format -> Id128FormatFlag, and make it bitfield. Fixes #25634. --- src/machine-id-setup/machine-id-setup-main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/machine-id-setup') diff --git a/src/machine-id-setup/machine-id-setup-main.c b/src/machine-id-setup/machine-id-setup-main.c index 6aef48650d..9101f4e11a 100644 --- a/src/machine-id-setup/machine-id-setup-main.c +++ b/src/machine-id-setup/machine-id-setup-main.c @@ -164,7 +164,7 @@ static int run(int argc, char *argv[]) { return r; etc_machine_id = prefix_roota(arg_root, "/etc/machine-id"); - r = id128_read(etc_machine_id, ID128_PLAIN, &id); + r = id128_read(etc_machine_id, ID128_FORMAT_PLAIN, &id); if (r < 0) return log_error_errno(r, "Failed to read machine ID back: %m"); } else { -- cgit v1.2.1