git://git.onelab.eu
/
util-vserver-pl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
contd...
[util-vserver-pl.git]
/
src
/
planetlab.c
diff --git
a/src/planetlab.c
b/src/planetlab.c
index
824039b
..
69f2228
100644
(file)
--- a/
src/planetlab.c
+++ b/
src/planetlab.c
@@
-44,6
+44,8
@@
POSSIBILITY OF SUCH DAMAGE.
#include <ctype.h>
#include <sys/resource.h>
#include <fcntl.h>
#include <ctype.h>
#include <sys/resource.h>
#include <fcntl.h>
+#define _GNU_SOURCE
+#include <sched.h>
#include "vserver.h"
#include "planetlab.h"
#include "vserver.h"
#include "planetlab.h"
@@
-96,10
+98,11
@@
process:
if (vc_ctx_create(ctx, 0) == VC_NOCTX)
return -1;
if (vc_ctx_create(ctx, 0) == VC_NOCTX)
return -1;
- /* Unshare the
NET
namespace if the slice if requested in the local slice configuration */
+ /* Unshare the
net
namespace if the slice if requested in the local slice configuration */
unshare_mask = get_space_flag(ctx);
if (unshare_mask != 0) {
sys_unshare(unshare_mask);
unshare_mask = get_space_flag(ctx);
if (unshare_mask != 0) {
sys_unshare(unshare_mask);
+ vc_set_namespace(ctx, unshare_mask);
}
/* Set capabilities - these don't take effect until SETUP flag is unset */
}
/* Set capabilities - these don't take effect until SETUP flag is unset */
@@
-187,6
+190,13
@@
pl_chcontext(xid_t ctx, uint64_t bcaps, const struct sliver_resources *slr)
migrate:
if (net_migrated || !vc_net_migrate(ctx))
{
migrate:
if (net_migrated || !vc_net_migrate(ctx))
{
+ uint32_t unshare_mask;
+ /* Unshare the net namespace if the slice if requested in the local slice configuration */
+ unshare_mask = get_space_flag(ctx);
+ if (unshare_mask != 0) {
+ vc_enter_namespace(ctx, unshare_mask);
+ }
+
if (!vc_tag_migrate(ctx) && !vc_ctx_migrate(ctx, 0))
break; /* done */
net_migrated = 1;
if (!vc_tag_migrate(ctx) && !vc_ctx_migrate(ctx, 0))
break; /* done */
net_migrated = 1;