X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fscripts%2Fvrpm-preload;h=db99902902c2b023696597b1b7a42b45147bda31;hb=faa778968d1a7dfeaebc9fe4b847e691dc62fd15;hp=55cce0e6bdfbf32ea03c4844b0e7fdef8a840e6e;hpb=567df24740f4b9f75c26dcf462daa7cb118e8d27;p=util-vserver.git diff --git a/util-vserver/scripts/vrpm-preload b/util-vserver/scripts/vrpm-preload index 55cce0e..db99902 100755 --- a/util-vserver/scripts/vrpm-preload +++ b/util-vserver/scripts/vrpm-preload @@ -20,35 +20,18 @@ set -e : ${UTIL_VSERVER_VARS:=/usr/lib/util-vserver/util-vserver-vars} test -e "$UTIL_VSERVER_VARS" || { - echo "Can not find util-vserver installation; aborting..." + echo $"Can not find util-vserver installation (the file '$UTIL_VSERVER_VARS' would be expected); aborting..." >&2 exit 1 } . "$UTIL_VSERVER_VARS" +. "$_LIB_FUNCTIONS" -lib=$_RPM_FAKE_SO - -#scall_nr=$($_VSERVER_INFO x SYSCALL_NEW_S_CONTEXT_NR 2>/dev/null) -#scall_rev=$($_VSERVER_INFO x SYSCALL_NEW_S_CONTEXT_REV 2>/dev/null) -vdir=$($_VSERVER_INFO "$CUR_VSERVER" VDIR) || vdir="$CUR_VSERVER" -ctx=$($_VSERVER_INFO "$CUR_VSERVER" CONTEXT) || ctx= - -test -d "$vdir" || { - echo $"Can not find chroot environment at '$vdir' for '$CUR_VSERVER'" >&2 - exit 1 -} for bin in `which rpm` /bin/rpm /usr/lib/rpm/rpm${RPM_FLAVOR:-i} ""; do ldd "$bin" &>/dev/null && break done -test "$bin" || { - echo $"No dynamically linked rpm binary found; exiting..." >&2 - exit 1 -} +test -x "$bin" || + panic $"No dynamically linked rpm binary found; exiting..." -#RPM_FAKE_S_CONTEXT_REV=$scall_rev \ -#RPM_FAKE_S_CONTEXT_NR=$scall_nr \ -RPM_FAKE_CHROOT=$vdir \ -RPM_FAKE_CTX=$ctx \ -RPM_FAKE_CAP=$[ ~0xd40c04ff ] \ -LD_PRELOAD=$lib${LD_PRELOAD:+:$LD_PRELOAD} \ -exec $bin "$@" +rpmFake.init "$CUR_VSERVER" +rpmFake.exec "$bin" "$@"