summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Pitt <martin.pitt@ubuntu.com>2015-11-02 10:05:20 -0600
committerMartin Pitt <martin.pitt@ubuntu.com>2015-11-02 10:05:20 -0600
commit1d40ddbfd35fa500dcf4312621c235ffe86d28e5 (patch)
tree5ee40ae1aa5704ddf5666f59f8e64287e22c39d1
parent0fc85c8670bfe2ea4af99765e79aaf789f3ed7e9 (diff)
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
-rw-r--r--README4
-rw-r--r--configure.ac2
-rw-r--r--src/core/main.c28
3 files changed, 3 insertions, 31 deletions
diff --git a/README b/README
index f6fb966b26..bc7068a66d 100644
--- a/README
+++ b/README
@@ -122,7 +122,7 @@ REQUIREMENTS:
glibc >= 2.16
libcap
- libmount >= 2.27 (from util-linux)
+ libmount >= 2.27.1 (from util-linux)
libseccomp >= 1.0.0 (optional)
libblkid >= 2.24 (from util-linux) (optional)
libkmod >= 15 (optional)
@@ -144,7 +144,7 @@ REQUIREMENTS:
During runtime, you need the following additional
dependencies:
- util-linux >= v2.27 required
+ util-linux >= v2.27.1 required
dbus >= 1.4.0 (strictly speaking optional, but recommended)
dracut (optional)
PolicyKit (optional)
diff --git a/configure.ac b/configure.ac
index c96b9fb1d9..88cb76667f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -437,7 +437,7 @@ AM_CONDITIONAL(HAVE_BLKID, [test "$have_blkid" = "yes"])
# ------------------------------------------------------------------------------
have_libmount=no
-PKG_CHECK_MODULES(MOUNT, [ mount >= 2.27 ],
+PKG_CHECK_MODULES(MOUNT, [ mount >= 2.27.1 ],
[AC_DEFINE(HAVE_LIBMOUNT, 1, [Define if libmount is available]) have_libmount=yes], have_libmount=no)
if test "x$have_libmount" = xno; then
AC_MSG_ERROR([*** libmount support required but libraries not found])
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();
}