]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
os-util: when determining support end, don't treat /etc/os-release file as error
authorLennart Poettering <lennart@poettering.net>
Mon, 23 Jan 2023 12:14:26 +0000 (13:14 +0100)
committerLennart Poettering <lennart@poettering.net>
Tue, 24 Jan 2023 14:32:43 +0000 (15:32 +0100)
Instead, let's just treat it as "field unset".

src/basic/os-util.c

index 7e794736343daa37ae201643b8ac72955a055dd6..3a2e4f59a6981446247716e2538cac4addc6a0ca 100644 (file)
@@ -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 */