chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c5d3439
)
main: minor optimization
author
Lennart Poettering
<lennart@poettering.net>
Fri, 4 Mar 2011 18:48:12 +0000
(19:48 +0100)
committer
Lennart Poettering
<lennart@poettering.net>
Fri, 4 Mar 2011 18:48:12 +0000
(19:48 +0100)
src/main.c
patch
|
blob
|
history
diff --git
a/src/main.c
b/src/main.c
index 3291561e099bbacc0d45bec83013ae47d523b7e4..ef6e681771914183c4e2d5d792091646b7564d27 100644
(file)
--- 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. */