summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDaniel Mack <github@zonque.org>2015-11-03 07:24:02 +0100
committerDaniel Mack <github@zonque.org>2015-11-03 07:24:02 +0100
commit5dea1c1e7902ca07ca1ea7f1914031c6e3a27be5 (patch)
tree9d7f88abac011838e70c742b218ad9ea1df0c4ad /src
parent2ac74784091679cf914d9e5ff5a35f8e0a3dd366 (diff)
parent1d40ddbfd35fa500dcf4312621c235ffe86d28e5 (diff)
Merge pull request #1754 from martinpitt/master
core: drop check for /etc/mtab
Diffstat (limited to 'src')
-rw-r--r--src/core/main.c28
1 files changed, 0 insertions, 28 deletions
diff --git a/src/core/main.c b/src/core/main.c
index dd21b26971..578de17fec 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -1113,33 +1113,6 @@ static int bump_rlimit_nofile(struct rlimit *saved_rlimit) {
return 0;
}
-static void test_mtab(void) {
-
- static const char ok[] =
- "/proc/self/mounts\0"
- "/proc/mounts\0"
- "../proc/self/mounts\0"
- "../proc/mounts\0";
-
- _cleanup_free_ char *p = NULL;
- int r;
-
- /* Check that /etc/mtab is a symlink to the right place or
- * non-existing. But certainly not a file, or a symlink to
- * some weird place... */
-
- r = readlink_malloc("/etc/mtab", &p);
- if (r == -ENOENT)
- return;
- if (r >= 0 && nulstr_contains(ok, p))
- return;
-
- log_error("/etc/mtab is not a symlink or not pointing to /proc/self/mounts. "
- "This is not supported anymore. "
- "Please replace /etc/mtab with a symlink to /proc/self/mounts.");
- freeze_or_reboot();
-}
-
static void test_usr(void) {
/* Check that /usr is not a separate fs */
@@ -1653,7 +1626,6 @@ int main(int argc, char *argv[]) {
loopback_setup();
bump_unix_max_dgram_qlen();
- test_mtab();
test_usr();
}