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:
90bbc94
)
main: don't check if /usr really is a mount point, since it is fine if it is passed...
author
Lennart Poettering
<lennart@poettering.net>
Wed, 9 Mar 2011 22:59:07 +0000
(23:59 +0100)
committer
Lennart Poettering
<lennart@poettering.net>
Wed, 9 Mar 2011 22:59:07 +0000
(23:59 +0100)
src/main.c
patch
|
blob
|
history
diff --git
a/src/main.c
b/src/main.c
index 37768c67adc8bd6d97a440561ca1c3c84739bb41..769fc6772cad56aae5809b50beb1144195ba1d26 100644
(file)
--- a/
src/main.c
+++ b/
src/main.c
@@
-942,25
+942,13
@@
static void test_mtab(void) {
}
static void test_usr(void) {
}
static void test_usr(void) {
- bool separate = false;
/* Check that /usr is not a separate fs */
/* Check that /usr is not a separate fs */
- 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. */
-
if (dir_is_empty("/usr") > 0)
if (dir_is_empty("/usr") > 0)
- separate = true;
-
- if (!separate)
- return;
-
- log_warning("/usr appears to be on a different file system than /. This is not supported anymore. "
- "Some things will probably break (sometimes even silently) in mysterious ways. "
- "Consult http://freedesktop.org/wiki/Software/systemd/separate-usr-is-broken for more information.");
+ log_warning("/usr appears to be on a different file system than /. This is not supported anymore. "
+ "Some things will probably break (sometimes even silently) in mysterious ways. "
+ "Consult http://freedesktop.org/wiki/Software/systemd/separate-usr-is-broken for more information.");
}
int main(int argc, char *argv[]) {
}
int main(int argc, char *argv[]) {