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/nspawn | |
| 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/nspawn')
| -rw-r--r-- | src/nspawn/nspawn.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c index 1282c8b98b..0618ab2313 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c @@ -2196,7 +2196,7 @@ static int setup_boot_id(void) { if (r < 0) return log_error_errno(r, "Failed to generate random boot id: %m"); - r = id128_write(path, ID128_UUID, rnd, false); + r = id128_write(path, ID128_FORMAT_UUID, rnd, false); if (r < 0) return log_error_errno(r, "Failed to write boot id: %m"); @@ -2830,9 +2830,9 @@ static int setup_machine_id(const char *directory) { etc_machine_id = prefix_roota(directory, "/etc/machine-id"); - r = id128_read(etc_machine_id, ID128_PLAIN_OR_UNINIT, &id); + r = id128_read(etc_machine_id, ID128_FORMAT_PLAIN, &id); if (r < 0) { - if (!IN_SET(r, -ENOENT, -ENOMEDIUM)) /* If the file is missing or empty, we don't mind */ + if (!IN_SET(r, -ENOENT, -ENOMEDIUM, -ENOPKG)) /* If the file is missing, empty, or uninitialized, we don't mind */ return log_error_errno(r, "Failed to read machine ID from container image: %m"); if (sd_id128_is_null(arg_uuid)) { |