util-linux-003-unshare-include-libmount.h.patch 1.3 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344
  1. From d754315c54af9cb8222e0a04ed5b2b4b927ed176 Mon Sep 17 00:00:00 2001
  2. From: Ruediger Meier <ruediger.meier@ga-group.nl>
  3. Date: Mon, 17 Mar 2014 11:48:47 +0100
  4. Subject: [PATCH 1/1] unshare: include libmount.h to provide missing MS_*
  5. defines
  6. Since 6728ca10 we are using MS_PRIVATE and MS_REC which are not defined
  7. in some systems's sys/mount.h.
  8. Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
  9. ---
  10. sys-utils/Makemodule.am | 1 +
  11. sys-utils/unshare.c | 3 +++
  12. 2 files changed, 4 insertions(+)
  13. diff --git a/sys-utils/Makemodule.am b/sys-utils/Makemodule.am
  14. index 30b5d3e..93a2c8d 100644
  15. --- a/sys-utils/Makemodule.am
  16. +++ b/sys-utils/Makemodule.am
  17. @@ -296,6 +296,7 @@ usrbin_exec_PROGRAMS += unshare
  18. dist_man_MANS += sys-utils/unshare.1
  19. unshare_SOURCES = sys-utils/unshare.c
  20. unshare_LDADD = $(LDADD) libcommon.la
  21. +unshare_CFLAGS = $(AM_CFLAGS) -I$(ul_libmount_incdir)
  22. endif
  23. if BUILD_NSENTER
  24. diff --git a/sys-utils/unshare.c b/sys-utils/unshare.c
  25. index 91e0ec7..1240293 100644
  26. --- a/sys-utils/unshare.c
  27. +++ b/sys-utils/unshare.c
  28. @@ -27,6 +27,9 @@
  29. #include <sys/wait.h>
  30. #include <sys/mount.h>
  31. +/* we only need some defines missing in sys/mount.h, no libmount linkage */
  32. +#include <libmount.h>
  33. +
  34. #include "nls.h"
  35. #include "c.h"
  36. #include "closestream.h"
  37. --
  38. 1.9.0