diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2022-12-08 06:30:31 +0100 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2022-12-12 13:57:31 +0100 |
| commit | 057bf780e9d45480fbacdd3b060dbe37b37f9693 (patch) | |
| tree | 4d610e28b18e2fd36ff68c024619398c3e68bc68 /src/boot | |
| parent | sd-id128: several cleanups (diff) | |
| download | systemd-057bf780e9d45480fbacdd3b060dbe37b37f9693.tar.xz systemd-057bf780e9d45480fbacdd3b060dbe37b37f9693.zip | |
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.
Diffstat (limited to 'src/boot')
| -rw-r--r-- | src/boot/bootctl.c | 2 |
1 files changed, 1 insertions, 1 deletions
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"); |