From d6e8096669fef4aa5132843fb488fa35de349901 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Fri, 15 Sep 2017 14:47:57 +0200
Subject: [PATCH] build-sys: require libmount >= 2.30 (#6795)

Fixes #4871.

The new libmount has two changes relevant for us:

- x-* options are propagated to /run/mount/utab and are visible through
  libmount (fixes #4817).

- umount -c now really works (partially solves #6115).
---
 README      | 5 ++---
 meson.build | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/README b/README
index c579ccb841..e36a1f9fa1 100644
--- a/README
+++ b/README
@@ -131,9 +131,8 @@ REQUIREMENTS:
 
         glibc >= 2.16
         libcap
-        libmount >= 2.27.1 (from util-linux)
-                (util-linux < 2.29 *must* be built with --enable-libmount-force-mountinfo,
-                 and later versions without --enable-libmount-support-mtab.)
+        libmount >= 2.30 (from util-linux)
+                (util-linux *must* be built without --enable-libmount-support-mtab)
         libseccomp >= 2.3.1 (optional)
         libblkid >= 2.24 (from util-linux) (optional)
         libkmod >= 15 (optional)
diff --git a/meson.build b/meson.build
index af17035586..3e85442a6f 100644
--- a/meson.build
+++ b/meson.build
@@ -659,7 +659,7 @@ if not libcap.found()
 endif
 
 libmount = dependency('mount',
-                      version : '>= 2.27')
+                      version : '>= 2.30')
 
 want_seccomp = get_option('seccomp')
 if want_seccomp != 'false'