From 469af08f58049a2a67b9e0289873a7f3300f5609 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 23 Jan 2023 13:14:26 +0100 Subject: [PATCH] os-util: when determining support end, don't treat /etc/os-release file as error Instead, let's just treat it as "field unset". --- src/basic/os-util.c | 4 ++-- 1 file 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 */ -- 2.25.1