summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Mack <daniel@zonque.org>2015-09-09 14:00:23 +0200
committerDaniel Mack <daniel@zonque.org>2015-09-09 14:00:23 +0200
commitbcce71873bbc908fbd11f2053edffe9151940eaa (patch)
treeae7d4c670f921ff7558c002ae3b17ce3574071ef
parent9c00a6adfa6c2ded071222b2ec76295480add34e (diff)
core: freeze execution if /etc/mtab exists
The mount monitor that was added to libmount v2.27 requires /etc/mtab to be non-existant. As systemd now uses that functionality, we cannot monitor any mounts anymore, and hence not support .mount units. Systems that have /etc/mtab around as regular file are unsupported by systemd since a long time. This patch makes that condition fatal, so we do not boot up with non-working mount monitor support.
-rw-r--r--src/core/main.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/core/main.c b/src/core/main.c
index 9aaf244e71..be7d41907a 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -1118,9 +1118,10 @@ static void test_mtab(void) {
if (r >= 0 && nulstr_contains(ok, p))
return;
- log_warning("/etc/mtab is not a symlink or not pointing to /proc/self/mounts. "
- "This is not supported anymore. "
- "Please make sure to replace this file by a symlink to avoid incorrect or misleading mount(8) output.");
+ log_error("/etc/mtab is not a symlink or not pointing to /proc/self/mounts. "
+ "This is not supported anymore. "
+ "Please make sure to replace this file by a symlink to avoid incorrect or misleading mount(8) output.");
+ freeze();
}
static void test_usr(void) {