Tagging module util-vserver - util-vserver-0.30.215-6

[util-vserver.git] / vserver-start / main.c

diff --git a/vserver-start/main.c b/vserver-start/main.c
index ab7c0fb..cb283c4 100644 (file)
--- a/vserver-start/main.c
+++ b/vserver-start/main.c
@@ -1,4 +1,4 @@
-// $Id: main.c,v 1.5 2005/03/19 02:07:40 ensc Exp $    --*- c -*--
+// $Id: main.c 2678 2008-02-16 22:09:30Z dhozac $    --*- c -*--
 
 // Copyright (C) 2004 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
 //  
@@ -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);