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/shared/specifier.c | |
| 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/shared/specifier.c')
| -rw-r--r-- | src/shared/specifier.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/shared/specifier.c b/src/shared/specifier.c index d54ab9f5a9..cd651768bd 100644 --- a/src/shared/specifier.c +++ b/src/shared/specifier.c @@ -195,7 +195,7 @@ int specifier_machine_id(char specifier, const void *data, const char *root, con /* Translate error for missing os-release file to EUNATCH. */ return fd == -ENOENT ? -EUNATCH : fd; - r = id128_read_fd(fd, ID128_PLAIN, &id); + r = id128_read_fd(fd, ID128_FORMAT_PLAIN, &id); } else r = sd_id128_get_machine(&id); if (r < 0) |