aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2016-04-02 19:00:44 +0200
committerDenys Vlasenko <vda.linux@googlemail.com>2016-04-02 19:00:44 +0200
commit8b0f459af7aa108089d0f87b0be81ccadb8638cb (patch)
treecdbdaeb96411367997e3aa91be852df7549e11ba
parentb14374a5ba7060d03c9859a5f61afdcdacc3dae6 (diff)
downloadbusybox-w32-8b0f459af7aa108089d0f87b0be81ccadb8638cb.tar.gz
busybox-w32-8b0f459af7aa108089d0f87b0be81ccadb8638cb.tar.bz2
busybox-w32-8b0f459af7aa108089d0f87b0be81ccadb8638cb.zip
nsenter,unshare: work around older header
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--util-linux/nsenter.c16
-rw-r--r--util-linux/unshare.c29
2 files changed, 45 insertions, 0 deletions
diff --git a/util-linux/nsenter.c b/util-linux/nsenter.c
index 0dad595cd..b08b3dae7 100644
--- a/util-linux/nsenter.c
+++ b/util-linux/nsenter.c
@@ -60,6 +60,22 @@
60//usage:#endif 60//usage:#endif
61 61
62#include <sched.h> 62#include <sched.h>
63#ifndef CLONE_NEWUTS
64# define CLONE_NEWUTS 0x04000000
65#endif
66#ifndef CLONE_NEWIPC
67# define CLONE_NEWIPC 0x08000000
68#endif
69#ifndef CLONE_NEWUSER
70# define CLONE_NEWUSER 0x10000000
71#endif
72#ifndef CLONE_NEWPID
73# define CLONE_NEWPID 0x20000000
74#endif
75#ifndef CLONE_NEWNET
76# define CLONE_NEWNET 0x40000000
77#endif
78
63#include "libbb.h" 79#include "libbb.h"
64 80
65struct namespace_descr { 81struct namespace_descr {
diff --git a/util-linux/unshare.c b/util-linux/unshare.c
index 95a7cb647..d05cfdb6c 100644
--- a/util-linux/unshare.c
+++ b/util-linux/unshare.c
@@ -40,7 +40,36 @@
40//usage: "\n --setgroups allow|deny Control the setgroups syscall in user namespaces" 40//usage: "\n --setgroups allow|deny Control the setgroups syscall in user namespaces"
41 41
42#include <sched.h> 42#include <sched.h>
43#ifndef CLONE_NEWUTS
44# define CLONE_NEWUTS 0x04000000
45#endif
46#ifndef CLONE_NEWIPC
47# define CLONE_NEWIPC 0x08000000
48#endif
49#ifndef CLONE_NEWUSER
50# define CLONE_NEWUSER 0x10000000
51#endif
52#ifndef CLONE_NEWPID
53# define CLONE_NEWPID 0x20000000
54#endif
55#ifndef CLONE_NEWNET
56# define CLONE_NEWNET 0x40000000
57#endif
58
43#include <sys/mount.h> 59#include <sys/mount.h>
60#ifndef MS_REC
61# define MS_REC (1 << 14)
62#endif
63#ifndef MS_PRIVATE
64# define MS_PRIVATE (1 << 18)
65#endif
66#ifndef MS_SLAVE
67# define MS_SLAVE (1 << 19)
68#endif
69#ifndef MS_SHARED
70# define MS_SHARED (1 << 20)
71#endif
72
44#include "libbb.h" 73#include "libbb.h"
45 74
46static void mount_or_die(const char *source, const char *target, 75static void mount_or_die(const char *source, const char *target,