X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=vserver-start%2Fmain.c;h=1ba419e74a2d8db8040bff3cf9b818b9339909d1;hb=925e69ce006ee22fbc35b8328dcd4942d9215c96;hp=3ff03e45e6125af00cff9f1dd176a4f7364d654c;hpb=9c78378bebc1a9f3d400f422df8ede9efea57dea;p=util-vserver.git diff --git a/vserver-start/main.c b/vserver-start/main.c index 3ff03e4..1ba419e 100644 --- a/vserver-start/main.c +++ b/vserver-start/main.c @@ -98,7 +98,7 @@ initLock() ptr = Xmemcpy(ptr, ".startup", sizeof(".startup")); *ptr = '\0'; - if (!lockfile(&fd, tmp, LOCK_EX, 30, &err)) { + if (!lockfile(&fd, tmp, F_LOCK, 30, &err)) { WRITE_MSG(2, "vserver.start: failed to lock '"); WRITE_STR(2, tmp); WRITE_MSG(2, "': "); @@ -115,7 +115,7 @@ checkConstraints() struct vc_vx_info info; xid = vc_getVserverCtx(opts.VSERVER_DIR, vcCFG_RECENT_FULL, - true, &is_running); + true, &is_running, vcCTX_XID); if (xid!=VC_NOCTX && vc_get_vx_info(xid, &info)!=-1) { WRITE_MSG(2, "vserver.start: vserver '"); @@ -166,7 +166,7 @@ int main(int UNUSED argc, char UNUSED *argv[]) execScriptlets(&cfgdir, opts.VSERVER_NAME, "prepre-start"); activateInterfaces(&cfg.interfaces); - xid = Evc_ctx_create(cfg.xid); + xid = Evc_ctx_create(cfg.xid, NULL); setCFlag(xid, VC_VXF_INFO_NAMESPACE); mountVserver(&cfg);