diff options
| author | Lennart Poettering <lennart@poettering.net> | 2011-03-09 23:59:07 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2011-03-09 23:59:07 +0100 |
| commit | b0c8757b056c18863d2f9c07ca3ba21f64a47b54 (patch) | |
| tree | 9353b03ac2f750b7cf3f31c0a00cdf3781def7cc | |
| parent | 90bbc9469ec29b6094dadf27aa88743d44ab56e7 (diff) | |
main: don't check if /usr really is a mount point, since it is fine if it is passed pre-mounted to us from the initrd
| -rw-r--r-- | src/main.c | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/src/main.c b/src/main.c index 37768c67ad..769fc6772c 100644 --- a/src/main.c +++ b/src/main.c @@ -942,25 +942,13 @@ static void test_mtab(void) { } static void test_usr(void) { - bool separate = false; /* 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) - 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[]) { |