]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
util: rework in_initrd() to make use of path_is_temporary_fs()
authorKairui Song <kasong@redhat.com>
Fri, 8 Jan 2021 06:52:26 +0000 (14:52 +0800)
committerKairui Song <kasong@redhat.com>
Tue, 12 Jan 2021 16:04:19 +0000 (00:04 +0800)
src/basic/util.c

index 7c708eb3be75a3b0fa871c10648c77c7ee18d025..907a8d1b2aa85d7a5f5694e3bf4ded154c4d6115 100644 (file)
@@ -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;
 }