]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
initrd: do a debug log if failed to detect rootfs type
authorKairui Song <kasong@redhat.com>
Wed, 13 Jan 2021 16:39:10 +0000 (00:39 +0800)
committerKairui Song <kasong@redhat.com>
Wed, 13 Jan 2021 17:24:56 +0000 (01:24 +0800)
src/basic/util.c

index 7de534163720e1b1e23d9ef4701983fcb0fc3cc6..2e6820a63b21db3b2a983b23f52d47e1fab43a5c 100644 (file)
@@ -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;
 }