From d379d44255469f03994832ab5821bf1b9034f4dc Mon Sep 17 00:00:00 2001
From: Karel Zak <kzak@redhat.com>
Date: Mon, 1 Jun 2015 13:48:01 +0200
Subject: mount: use libmount to monitor mountinfo & utab

The current implementation directly monitor /proc/self/mountinfo and
/run/mount/utab files. It's really not optimal because utab file is
private libmount stuff without any official guaranteed semantic.

The libmount since v2.26 provides API to monitor mount kernel &
userspace changes and since v2.27 the monitor is usable for
non-root users too.

This patch replaces the current implementation with libmount based
solution.

Signed-off-by: Karel Zak <kzak@redhat.com>
---
 Makefile.am | 33 ++++++++++++++++++++++-----------
 1 file changed, 22 insertions(+), 11 deletions(-)

(limited to 'Makefile.am')

diff --git a/Makefile.am b/Makefile.am
index c395840759..57dfee7cc8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1327,7 +1327,8 @@ systemd_SOURCES = \
 
 systemd_CFLAGS = \
 	$(AM_CFLAGS) \
-	$(SECCOMP_CFLAGS)
+	$(SECCOMP_CFLAGS) \
+	$(MOUNT_CFLAGS)
 
 systemd_LDADD = \
 	libcore.la
@@ -1532,7 +1533,8 @@ test_engine_SOURCES = \
 
 test_engine_CFLAGS = \
 	$(AM_CFLAGS) \
-	$(SECCOMP_CFLAGS)
+	$(SECCOMP_CFLAGS) \
+	$(MOUNT_CFLAGS)
 
 test_engine_LDADD = \
 	libcore.la
@@ -1542,7 +1544,8 @@ test_job_type_SOURCES = \
 
 test_job_type_CFLAGS = \
 	$(AM_CFLAGS) \
-	$(SECCOMP_CFLAGS)
+	$(SECCOMP_CFLAGS) \
+	$(MOUNT_CFLAGS)
 
 test_job_type_LDADD = \
 	libcore.la
@@ -1592,7 +1595,8 @@ test_unit_name_SOURCES = \
 
 test_unit_name_CFLAGS = \
 	$(AM_CFLAGS) \
-	$(SECCOMP_CFLAGS)
+	$(SECCOMP_CFLAGS) \
+	$(MOUNT_CFLAGS)
 
 test_unit_name_LDADD = \
 	libcore.la
@@ -1602,7 +1606,8 @@ test_unit_file_SOURCES = \
 
 test_unit_file_CFLAGS = \
 	$(AM_CFLAGS) \
-	$(SECCOMP_CFLAGS)
+	$(SECCOMP_CFLAGS) \
+	$(MOUNT_CFLAGS)
 
 test_unit_file_LDADD = \
 	libcore.la
@@ -1811,7 +1816,8 @@ test_tables_CPPFLAGS = \
 
 test_tables_CFLAGS = \
 	$(AM_CFLAGS) \
-	$(SECCOMP_CFLAGS)
+	$(SECCOMP_CFLAGS) \
+	$(MOUNT_CFLAGS)
 
 test_tables_LDADD = \
 	libjournal-core.la \
@@ -1937,7 +1943,8 @@ test_cgroup_mask_SOURCES = \
 	src/test/test-cgroup-mask.c
 
 test_cgroup_mask_CPPFLAGS = \
-	$(AM_CPPFLAGS)
+	$(AM_CPPFLAGS) \
+	$(MOUNT_CFLAGS)
 
 test_cgroup_mask_CFLAGS = \
 	$(AM_CFLAGS) \
@@ -1980,7 +1987,8 @@ test_path_SOURCES = \
 	src/test/test-path.c
 
 test_path_CFLAGS = \
-	$(AM_CFLAGS)
+	$(AM_CFLAGS) \
+	$(MOUNT_CFLAGS)
 
 test_path_LDADD = \
 	libcore.la
@@ -1989,7 +1997,8 @@ test_execute_SOURCES = \
 	src/test/test-execute.c
 
 test_execute_CFLAGS = \
-	$(AM_CFLAGS)
+	$(AM_CFLAGS) \
+	$(MOUNT_CFLAGS)
 
 test_execute_LDADD = \
 	libcore.la
@@ -2016,7 +2025,8 @@ test_sched_prio_SOURCES = \
 	src/test/test-sched-prio.c
 
 test_sched_prio_CPPFLAGS = \
-	$(AM_CPPFLAGS)
+	$(AM_CPPFLAGS) \
+	$(MOUNT_CFLAGS)
 
 test_sched_prio_CFLAGS = \
 	$(AM_CFLAGS) \
@@ -2103,7 +2113,8 @@ systemd_analyze_SOURCES = \
 
 systemd_analyze_CFLAGS = \
 	$(AM_CFLAGS) \
-	$(SECCOMP_CFLAGS)
+	$(SECCOMP_CFLAGS) \
+	$(MOUNT_CFLAGS)
 
 systemd_analyze_LDADD = \
 	libcore.la
-- 
cgit v1.2.3-54-g00ecf