From: Enrico Scholz Date: Thu, 26 Feb 2004 13:08:13 +0000 (+0000) Subject: use VC_DYNAMIC_XID instead of VC_RANDCTX X-Git-Tag: VERSION_0_10~556 X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=37cc2825bff0aea360b9dcca7bfebf36d33b0933;p=util-vserver.git use VC_DYNAMIC_XID instead of VC_RANDCTX git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@1010 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- diff --git a/util-vserver/src/chcontext.c b/util-vserver/src/chcontext.c index 0052d50..1b59a6d 100644 --- a/util-vserver/src/chcontext.c +++ b/util-vserver/src/chcontext.c @@ -377,7 +377,7 @@ int main (int argc, char *argv[]) args.domainname = ""; if (args.nbctx == 0) - args.ctxs[args.nbctx++] = VC_RANDCTX; + args.ctxs[args.nbctx++] = VC_DYNAMIC_XID; xflags = args.flags & S_CTX_INFO_INIT; args.flags &= ~S_CTX_INFO_INIT; @@ -391,7 +391,7 @@ int main (int argc, char *argv[]) if (args.remove_caps!=0 || xflags!=0) Evc_new_s_context (VC_SAMECTX,args.remove_caps,xflags); - tellContext(args.ctxs[0]==VC_RANDCTX ? newctx : args.ctxs[0]); + tellContext(args.ctxs[0]==VC_DYNAMIC_XID ? newctx : args.ctxs[0]); doSyncStage1(p); execvp (argv[optind],argv+optind); diff --git a/util-vserver/src/rpm-fake-resolver.c b/util-vserver/src/rpm-fake-resolver.c index b9abdd6..cb04281 100644 --- a/util-vserver/src/rpm-fake-resolver.c +++ b/util-vserver/src/rpm-fake-resolver.c @@ -230,7 +230,7 @@ daemonize(struct ArgInfo const UNUSED * args, int pid_fd) int main(int argc, char * argv[]) { struct ArgInfo args = { - .ctx = VC_RANDCTX, + .ctx = VC_DYNAMIC_XID, .uid = 99, .gid = 99, .do_fork = true, diff --git a/util-vserver/src/rpm-fake.c b/util-vserver/src/rpm-fake.c index 5e44a08..62cba0e 100644 --- a/util-vserver/src/rpm-fake.c +++ b/util-vserver/src/rpm-fake.c @@ -21,8 +21,8 @@ #endif #include "pathconfig.h" -#include "util.h" #include "sys_clone.h" +#include "util.h" #include @@ -299,7 +299,7 @@ initEnvironment() if (ctx_s && *ctx_s) ctx_s = strdup(ctx_s); else ctx_s = 0; - ctx = getAndClearEnv("RPM_FAKE_CTX", VC_RANDCTX); + ctx = getAndClearEnv("RPM_FAKE_CTX", VC_DYNAMIC_XID); caps = getAndClearEnv("RPM_FAKE_CAP", ~0x3404040f); flags = getAndClearEnv("RPM_FAKE_FLAGS", 0); root = getenv("RPM_FAKE_CHROOT");