diff options
author | Lennart Poettering <lennart@poettering.net> | 2023-01-23 13:14:26 +0100 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2023-01-24 15:32:43 +0100 |
commit | 469af08f58049a2a67b9e0289873a7f3300f5609 (patch) | |
tree | 0032b59e1ba8c8766c1bb997ce8c0be9c5ed983d /src/basic/os-util.c | |
parent | 3d46a8292ffd9f502a1a8680bf992917ae8932ad (diff) | |
download | systemd-469af08f58049a2a67b9e0289873a7f3300f5609.tar.gz |
os-util: when determining support end, don't treat /etc/os-release file as error
Instead, let's just treat it as "field unset".
Diffstat (limited to 'src/basic/os-util.c')
-rw-r--r-- | src/basic/os-util.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/basic/os-util.c b/src/basic/os-util.c index 7e79473634..3a2e4f59a6 100644 --- a/src/basic/os-util.c +++ b/src/basic/os-util.c @@ -346,8 +346,8 @@ int os_release_support_ended(const char *support_end, bool quiet) { r = parse_os_release(NULL, "SUPPORT_END", &_support_end_alloc); - if (r < 0) - return log_full_errno((r == -ENOENT || quiet) ? LOG_DEBUG : LOG_WARNING, r, + if (r < 0 && r != -ENOENT) + return log_full_errno(quiet ? LOG_DEBUG : LOG_WARNING, r, "Failed to read os-release file, ignoring: %m"); if (!_support_end_alloc) return false; /* no end date defined */ |