summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKairui Song <kasong@redhat.com>2021-01-08 14:52:26 +0800
committerKairui Song <kasong@redhat.com>2021-01-13 00:04:19 +0800
commit96cceb35e7985f5ee6c9b17e129a76259273cdde (patch)
tree9261fd28ce3542911dbbdf42926180d709391de1
parentb433300e4cd5cc9ea6a3240b8d5755fd62c26d99 (diff)
downloadsystemd-96cceb35e7985f5ee6c9b17e129a76259273cdde.tar.gz
util: rework in_initrd() to make use of path_is_temporary_fs()
-rw-r--r--src/basic/util.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/basic/util.c b/src/basic/util.c
index 7c708eb3be..907a8d1b2a 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;
}