From: Kairui Song <kasong@redhat.com>
Date: Wed, 13 Jan 2021 16:39:10 +0000 (+0800)
Subject: initrd: do a debug log if failed to detect rootfs type
X-Git-Tag: v248-rc1~343^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3b9b91696844a27419b98bedd3cd09d13f745a23;p=thirdparty%2Fsystemd.git

initrd: do a debug log if failed to detect rootfs type
---

diff --git a/src/basic/util.c b/src/basic/util.c
index 7de53416372..2e6820a63b2 100644
--- a/src/basic/util.c
+++ b/src/basic/util.c
@@ -88,8 +88,16 @@ bool in_initrd(void) {
                 }
         }
 
-        saved_in_initrd = (lenient || path_is_temporary_fs("/") > 0) &&
-                          access("/etc/initrd-release", F_OK) >= 0;
+        if (!lenient) {
+                r = path_is_temporary_fs("/");
+                if (r < 0)
+                        log_debug_errno(r, "Couldn't determine if / is a temporary file system: %m");
+
+                saved_in_initrd = r > 0;
+        }
+
+        if (saved_in_initrd != 0)
+                saved_in_initrd = access("/etc/initrd-release", F_OK) >= 0;
 
         return saved_in_initrd;
 }