#endif
#include "pathconfig.h"
-#include "util.h"
#include "sys_clone.h"
+#include "util.h"
-#include <vserver.h>
+#include "lib/vserver.h"
+#include "lib/internal.h"
+#include <sys/socket.h>
#include <dlfcn.h>
#include <stdlib.h>
#include <stdint.h>
#include <signal.h>
#include <sys/types.h>
#include <sys/wait.h>
-#include <sys/socket.h>
#include <sys/un.h>
#include <fcntl.h>
#include <pwd.h>
#include <grp.h>
+#define ENSC_WRAPPERS_PREFIX "rpm-fake.so: "
+#define ENSC_WRAPPERS_VSERVER 1
+#define ENSC_WRAPPERS_UNISTD 1
+#include <wrappers.h>
+
#ifndef CLONE_NEWNS
# define CLONE_NEWNS 0x00020000
#endif
#define PLATFORM_FILE "/etc/rpm/platform"
#define INIT(FILE,FUNC) FUNC##_func = ((__typeof__(FUNC) *) (xdlsym(FILE, #FUNC)))
-#define DECLARE(FUNC) static __typeof__(FUNC) * FUNC##_func = 0
+#define DECLARE(FUNC) static __typeof__(FUNC) * FUNC##_func = 0
#define DBG_INIT 0x0001
return res;
}
+static void
+setupContext(xid_t xid)
+{
+
+ if (vc_isSupported(vcFEATURE_MIGRATE)) {
+ xid_t rc = vc_create_context(xid);
+ if (rc==VC_NOCTX && errno!=EEXIST) {
+ perror("rpm-fake.so: vc_create_context()");
+ exit(255);
+ }
+
+ if (rc!=VC_NOCTX) {
+ char buf[128];
+ size_t l;
+ strcpy(buf, "rpm-fake.so #");
+ l = utilvserver_fmt_uint(buf+sizeof("rpm-fake.so #")-1, getppid());
+ Evc_set_vhi_name(rc, vcVHI_CONTEXT, buf, sizeof("rpm-fake.so #")+l-1);
+#warning set some sane capabilities
+ // context will be activated later...
+
+ xid = rc;
+ }
+ }
+
+ Ewrite(3, &xid, sizeof xid);
+}
+
#if 0
static void
initPwSocket()
connect(pw_sock, (struct sockaddr *)(&addr), sizeof addr)==-1 ||
(flag=fcntl(pw_sock, F_GETFD))==-1 ||
fcntl(pw_sock, F_SETFD, flag | FD_CLOEXEC)==-1) {
- perror("error while initializing pw-socket");
+ perror("rpm-fake.so: error while initializing pw-socket");
exit(255);
}
}
if (gid) { *ptr++ = "-g"; *ptr++ = gid; }
if (ctx_s) { *ptr++ = "-c"; *ptr++ = ctx_s; }
*ptr++ = 0;
-
+
+ setupContext(ctx);
execve(resolver, (char **)args, (char **)env);
perror("rpm-fake.so: failed to exec resolver");
exit(255);
pw_sock = res_sock[0];
sync_sock = sync_pipe[0];
- if (read(sync_sock, &c, 1)!=1 ||
+ if (read(sync_sock, &ctx, sizeof ctx)!=sizeof(ctx) ||
+ read(sync_sock, &c, 1)!=1 ||
write(pw_sock, ".", 1)!=1 ||
read(pw_sock, &c, 1)!=1 ||
c!='.') {
if (ctx_s && *ctx_s) ctx_s = strdup(ctx_s);
else ctx_s = 0;
- ctx = getAndClearEnv("RPM_FAKE_CTX", VC_RANDCTX);
+ ctx = getAndClearEnv("RPM_FAKE_CTX", VC_DYNAMIC_XID);
caps = getAndClearEnv("RPM_FAKE_CAP", ~0x3404040f);
flags = getAndClearEnv("RPM_FAKE_FLAGS", 0);
root = getenv("RPM_FAKE_CHROOT");
{
int res;
- if ((res=vc_new_s_context(ctx,caps,flags))!=-1 &&
- (res=execv_func(path, argv)!=-1) ) {}
+ if (vc_isSupported(vcFEATURE_MIGRATE))
+ res = vc_migrate_context(ctx);
+ else
+ res = vc_new_s_context(ctx,caps,flags);
+
+ if (res!=-1)
+ res=execv_func(path, argv);
return res;
}