From 1d40ddbfd35fa500dcf4312621c235ffe86d28e5 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Mon, 2 Nov 2015 10:05:20 -0600 Subject: core: drop check for /etc/mtab util-linux 2.27.1 now entirely stops looking at /etc/mtab, so we don't need to verify /etc/mtab during early boot any more. Later on, tmpfiles.d/etc.conf will fix /etc/mtab anyway, so there's not even a point in warning about it. Drop test_mtab() and bump the util-linux dependency to >= 2.17.1. Fixes #1495 --- src/core/main.c | 28 ---------------------------- 1 file changed, 28 deletions(-) (limited to 'src') diff --git a/src/core/main.c b/src/core/main.c index 593b974566..59078c968b 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 */ @@ -1614,7 +1587,6 @@ int main(int argc, char *argv[]) { machine_id_setup(NULL); loopback_setup(); - test_mtab(); test_usr(); } -- cgit v1.2.3-54-g00ecf