]> git.ipfire.org Git - thirdparty/util-linux.git/commitdiff
unshare: include libmount.h to provide missing MS_* defines
authorRuediger Meier <ruediger.meier@ga-group.nl>
Mon, 17 Mar 2014 10:48:47 +0000 (11:48 +0100)
committerRuediger Meier <ruediger.meier@ga-group.nl>
Mon, 17 Mar 2014 10:48:47 +0000 (11:48 +0100)
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>
sys-utils/Makemodule.am
sys-utils/unshare.c

index 30b5d3e0246988a12109f24ec5ca0609ddda26b6..93a2c8d928f8bdba0607ebbce01b52c6a55c69cd 100644 (file)
@@ -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
index 91e0ec74a813ce97a541e1a66f8e6c0bbea4503f..1240293c05dbe7b501455a7274fa588f9640703b 100644 (file)
@@ -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"