summaryrefslogtreecommitdiffstats
path: root/sys-utils
diff options
context:
space:
mode:
authorRuediger Meier2014-03-17 11:48:47 +0100
committerRuediger Meier2014-03-17 11:48:47 +0100
commitd754315c54af9cb8222e0a04ed5b2b4b927ed176 (patch)
tree76e931ae8d18c4ae5b2c5b1b2a7fe7ec9bd4ad37 /sys-utils
parentinclude/closestream: don't wipe errno on EPIPE (diff)
downloadkernel-qcow2-util-linux-d754315c54af9cb8222e0a04ed5b2b4b927ed176.tar.gz
kernel-qcow2-util-linux-d754315c54af9cb8222e0a04ed5b2b4b927ed176.tar.xz
kernel-qcow2-util-linux-d754315c54af9cb8222e0a04ed5b2b4b927ed176.zip
unshare: include libmount.h to provide missing MS_* defines
Since 6728ca10 we are using MS_PRIVATE and MS_REC which are not defined in some systems's sys/mount.h. Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
Diffstat (limited to 'sys-utils')
-rw-r--r--sys-utils/Makemodule.am1
-rw-r--r--sys-utils/unshare.c3
2 files changed, 4 insertions, 0 deletions
diff --git a/sys-utils/Makemodule.am b/sys-utils/Makemodule.am
index 30b5d3e02..93a2c8d92 100644
--- a/sys-utils/Makemodule.am
+++ b/sys-utils/Makemodule.am
@@ -296,6 +296,7 @@ usrbin_exec_PROGRAMS += unshare
dist_man_MANS += sys-utils/unshare.1
unshare_SOURCES = sys-utils/unshare.c
unshare_LDADD = $(LDADD) libcommon.la
+unshare_CFLAGS = $(AM_CFLAGS) -I$(ul_libmount_incdir)
endif
if BUILD_NSENTER
diff --git a/sys-utils/unshare.c b/sys-utils/unshare.c
index 91e0ec74a..1240293c0 100644
--- a/sys-utils/unshare.c
+++ b/sys-utils/unshare.c
@@ -27,6 +27,9 @@
#include <sys/wait.h>
#include <sys/mount.h>
+/* we only need some defines missing in sys/mount.h, no libmount linkage */
+#include <libmount.h>
+
#include "nls.h"
#include "c.h"
#include "closestream.h"