X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fsrc%2Fvps.c;h=ead995da4b4b5e3870858a7ca3e1387e7d3b74b1;hb=a917f24ef7b003dcef54a3db2644cf9cb4bc2db2;hp=99ee4a9ce2aad6bf2e1eb351c3fea661842ad06a;hpb=c063d0f2121214682328435ead30e84e2d8974d3;p=util-vserver.git diff --git a/util-vserver/src/vps.c b/util-vserver/src/vps.c index 99ee4a9..ead995d 100644 --- a/util-vserver/src/vps.c +++ b/util-vserver/src/vps.c @@ -21,13 +21,18 @@ #endif #include "util.h" -#include "wrappers.h" -#include "wrappers-vserver.h" #include "pathconfig.h" #include #include #include +#include + +#define ENSC_WRAPPERS_VSERVER 1 +#define ENSC_WRAPPERS_STDLIB 1 +#define ENSC_WRAPPERS_UNISTD 1 +#define ENSC_WRAPPERS_FCNTL 1 +#include #define CTXNR_WIDTH 5 #define HUNK_SIZE 0x4000 @@ -197,6 +202,7 @@ processOutput(char *data, size_t len) write(1, data, pid_end); l = writeContextInfo(ctx, vserver_name); if (l1) { if (strcmp(argv[1], "--help") ==0) showHelp(1, argv[0], 0); if (strcmp(argv[1], "--version")==0) showVersion(); } - - if (vc_get_task_xid(0)!=1) - Evc_new_s_context(1, vc_get_securecaps(), 0); + + if (!switchToWatchXid(&errptr)) { + perror(errptr); + exit(wrapper_exit_code); + } Epipe(p); pid = Efork();