From: Kairui Song <kasong@redhat.com>
Date: Wed, 13 Jan 2021 17:25:20 +0000 (+0800)
Subject: initrd: do a debug log if /etc/initrd-release doesn't take effect
X-Git-Tag: v248-rc1~343^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F18124%2Fhead;p=thirdparty%2Fsystemd.git

initrd: do a debug log if /etc/initrd-release doesn't take effect

Signed-off-by: Kairui Song <kasong@redhat.com>
---

diff --git a/src/basic/util.c b/src/basic/util.c
index 2e6820a63b2..d24d52190cd 100644
--- a/src/basic/util.c
+++ b/src/basic/util.c
@@ -96,8 +96,17 @@ bool in_initrd(void) {
                 saved_in_initrd = r > 0;
         }
 
-        if (saved_in_initrd != 0)
-                saved_in_initrd = access("/etc/initrd-release", F_OK) >= 0;
+        r = access("/etc/initrd-release", F_OK);
+        if (r >= 0) {
+                if (saved_in_initrd == 0)
+                        log_debug("/etc/initrd-release exists, but it's not an initrd.");
+                else
+                        saved_in_initrd = 1;
+        } else {
+                if (errno != ENOENT)
+                        log_debug_errno(errno, "Failed to test if /etc/initrd-release exists: %m");
+                saved_in_initrd = 0;
+        }
 
         return saved_in_initrd;
 }