X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fvcontext.c;h=0f2f95baa8ff57dae61a3093220d37d25473f4da;hb=a15f4fdad07cbbb643a6ef34067781c3c9fe1b09;hp=cabcbc34dad4ccdaa671928301eac57bc836b81e;hpb=35a3974ee427fb46d03e0d08899cedaf10512758;p=util-vserver.git diff --git a/src/vcontext.c b/src/vcontext.c index cabcbc3..0f2f95b 100644 --- a/src/vcontext.c +++ b/src/vcontext.c @@ -254,15 +254,15 @@ doit(struct Arguments const *args, int argc, char *argv[]) doSyncStage0(p, args->do_disconnect); if (args->do_create) { - xid = vc_ctx_create(args->xid); + xid = vc_ctx_create(args->xid, NULL); if (xid==VC_NOCTX) { switch (errno) { case EEXIST : if (!args->is_silentexist) - perror(ENSC_WRAPPERS_PREFIX "vc_create_context()"); + perror(ENSC_WRAPPERS_PREFIX "vc_ctx_create()"); return 254; default : - perror(ENSC_WRAPPERS_PREFIX "vc_create_context()"); + perror(ENSC_WRAPPERS_PREFIX "vc_ctx_create()"); return wrapper_exit_code; } } @@ -274,15 +274,15 @@ doit(struct Arguments const *args, int argc, char *argv[]) if (args->do_chroot) { Echroot("."); if (args->set_namespace) { - if (args->do_migrateself) Evc_set_namespace(); - else if (args->do_migrate) Evc_enter_namespace(xid); + if (args->do_migrateself) Evc_set_namespace(xid, 0); + else if (args->do_migrate) Evc_enter_namespace(xid, 0); } } setFlags(args, xid); if (args->do_migrate && !args->do_migrateself) - Evc_ctx_migrate(xid); + Evc_ctx_migrate(xid, 0); if (args->uid != NULL) { uid_t uid = 0; @@ -426,7 +426,7 @@ int main (int argc, char *argv[]) default : WRITE_MSG(2, "Try '"); WRITE_STR(2, argv[0]); - WRITE_MSG(2, " --help\" for more information.\n"); + WRITE_MSG(2, " --help' for more information.\n"); return wrapper_exit_code; break; } @@ -438,7 +438,7 @@ int main (int argc, char *argv[]) args.xid = Evc_get_task_xid(0); if (!args.do_create && !args.do_migrate) - WRITE_MSG(2, "Neither '--create' nor '--migrate specified; try '--help' for more information\n"); + WRITE_MSG(2, "Neither '--create' nor '--migrate' specified; try '--help' for more information\n"); else if (args.do_create && args.do_migrate) WRITE_MSG(2, "Can not specify '--create' and '--migrate' at the same time; try '--help' for more information\n"); else if (!args.do_migrate && args.is_initpid)