X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=src%2Frpm-fake.c;h=9bb5a6c8177def339c126f798c4e1963d0d2a46d;hb=a741f6faf2baae1e823d334012f6a09e6a1bda51;hp=619dfadf9773d75598e08523fd90b953d73d1968;hpb=3f3cf95f755f3ef1c31ad8e38153deb4ee214c66;p=util-vserver.git diff --git a/src/rpm-fake.c b/src/rpm-fake.c index 619dfad..9bb5a6c 100644 --- a/src/rpm-fake.c +++ b/src/rpm-fake.c @@ -1,4 +1,4 @@ -// $Id: rpm-fake.c,v 1.32 2005/07/03 12:26:28 ensc Exp $ --*- c++ -*-- +// $Id: rpm-fake.c 2578 2007-08-08 20:05:26Z dhozac $ --*- c++ -*-- // Copyright (C) 2003 Enrico Scholz // @@ -66,10 +66,6 @@ int rpm_execcon(unsigned int verified, #undef _POSIX_SOURCE #include "capability-compat.h" -#ifndef CLONE_NEWNS -# define CLONE_NEWNS 0x00020000 -#endif - #define LIBNAME "rpm-fake.so" #define PLATFORM_FILE "/etc/rpm/platform" @@ -249,9 +245,9 @@ setupContext(xid_t xid, char const **xid_str) xid_t rc=VC_NOCTX; if ((xid==VC_DYNAMIC_XID || !vc_is_dynamic_xid(xid)) && - (rc=vc_ctx_create(xid))==VC_NOCTX && + (rc=vc_ctx_create(xid, NULL))==VC_NOCTX && errno!=EEXIST) { - perror(ENSC_WRAPPERS_PREFIX "vc_create_context()"); + perror(ENSC_WRAPPERS_PREFIX "vc_ctx_create()"); exit(255); } @@ -599,7 +595,7 @@ execvWorker(char const *path, char * const argv[], char * const envp[]) int res = -1; if (vc_isSupported(vcFEATURE_MIGRATE)) - res = vc_ctx_migrate(ctx); + res = vc_ctx_migrate(ctx, 0); else { #ifdef VC_ENABLE_API_COMPAT res = vc_new_s_context(ctx,caps,flags);