summaryrefslogtreecommitdiff
path: root/src/shared/util.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2012-05-21 20:00:58 +0200
committerLennart Poettering <lennart@poettering.net>2012-05-21 20:00:58 +0200
commit8f33b5b8b3e85f9c3b00eb004e601f7a72fa6461 (patch)
treed9166ff2738a5ceeb09beb988652a81eeb1ee83b /src/shared/util.c
parent2660882b52ae1a5d97a2344633a999d88a3cd45b (diff)
util: rework in_initrd() logic
Checking the device major/minor is not a good idea. Let's replace this with an explicit flag file, which we model after /etc/os-release and call /etc/initrd-release.
Diffstat (limited to 'src/shared/util.c')
-rw-r--r--src/shared/util.c16
1 files changed, 5 insertions, 11 deletions
diff --git a/src/shared/util.c b/src/shared/util.c
index 5acddd3e0f..4b841491aa 100644
--- a/src/shared/util.c
+++ b/src/shared/util.c
@@ -5654,16 +5654,10 @@ bool is_valid_documentation_url(const char *url) {
}
bool in_initrd(void) {
- static bool checked=false;
- static bool is_in_initrd=false;
-
- if (!checked) {
- struct stat sb;
- if (stat("/", &sb) == 0) {
- is_in_initrd = (sb.st_dev == 1);
- checked = true;
- }
- }
+ static int saved = -1;
+
+ if (saved < 0)
+ saved = access("/etc/initrd-release", F_OK) >= 0;
- return is_in_initrd;
+ return saved;
}