X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=vserver-start%2Fmain.c;h=1ba419e74a2d8db8040bff3cf9b818b9339909d1;hb=4d83b16873c3833729374cf45163f0d5bc00aa76;hp=953daf2ecfc3a7492eccd92e659008a45ae50980;hpb=a6be71d3e49f0f633705ba5e4e08cc1cac811344;p=util-vserver.git diff --git a/vserver-start/main.c b/vserver-start/main.c index 953daf2..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 '");