summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2011-03-04 19:48:12 +0100
committerLennart Poettering <lennart@poettering.net>2011-03-04 19:48:12 +0100
commit81ab0d3c65206140fffafefa6d14e8494edc44cb (patch)
tree4dfc01d100c21315d592fffd6aff68180c8ea890
parentc5d3439055d20be03ed3dff4b31f64da54319be0 (diff)
downloadsystemd-81ab0d3c65206140fffafefa6d14e8494edc44cb.tar.gz
main: minor optimization
-rw-r--r--src/main.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/main.c b/src/main.c
index 3291561e09..ef6e681771 100644
--- a/src/main.c
+++ b/src/main.c
@@ -941,15 +941,12 @@ static void test_mtab(void) {
}
static void test_usr(void) {
- struct stat a, b;
bool separate = false;
/* Check that /usr is not a separate fs */
- if (lstat("/", &a) >= 0 && lstat("/usr", &b) >= 0)
- if (a.st_dev != b.st_dev)
- separate = true;
-
+ if (path_is_mount_point("/usr") > 0)
+ separate = true;
/* This check won't work usually during boot, since /usr is
* probably not mounted yet, hence let's add a second
* check. We just check whether /usr is an empty directory. */