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/boot/bootctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/boot/bootctl.c') diff --git a/src/boot/bootctl.c b/src/boot/bootctl.c index 0df456827c..44a5a371b9 100644 --- a/src/boot/bootctl.c +++ b/src/boot/bootctl.c @@ -179,7 +179,7 @@ static int load_etc_machine_id(void) { int r; r = sd_id128_get_machine(&arg_machine_id); - if (IN_SET(r, -ENOENT, -ENOMEDIUM)) /* Not set or empty */ + if (IN_SET(r, -ENOENT, -ENOMEDIUM, -ENOPKG)) /* Not set or empty */ return 0; if (r < 0) return log_error_errno(r, "Failed to get machine-id: %m"); -- cgit v1.2.1