From: Kairui Song <kasong@redhat.com>
Date: Fri, 8 Jan 2021 06:52:26 +0000 (+0800)
Subject: util: rework in_initrd() to make use of path_is_temporary_fs()
X-Git-Tag: v248-rc1~343^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=96cceb35e7985f5ee6c9b17e129a76259273cdde;p=thirdparty%2Fsystemd.git

util: rework in_initrd() to make use of path_is_temporary_fs()
---

diff --git a/src/basic/util.c b/src/basic/util.c
index 7c708eb3be7..907a8d1b2aa 100644
--- a/src/basic/util.c
+++ b/src/basic/util.c
@@ -52,7 +52,6 @@ int prot_from_flags(int flags) {
 }
 
 bool in_initrd(void) {
-        struct statfs s;
         int r;
 
         if (saved_in_initrd >= 0)
@@ -76,8 +75,7 @@ bool in_initrd(void) {
                 saved_in_initrd = r > 0;
         else
                 saved_in_initrd = access("/etc/initrd-release", F_OK) >= 0 &&
-                                  statfs("/", &s) >= 0 &&
-                                  is_temporary_fs(&s);
+                                  path_is_temporary_fs("/") > 0;
 
         return saved_in_initrd;
 }