X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fscripts%2Fvrpm-preload;h=1036e5cd40c840373824fd05fb3f5c600a17b871;hb=38f369f5584d0595aeed3d973cf564ba2695a048;hp=c5ef7d8465f37df89a368fb970b15fea11a08f66;hpb=c0c44ae3fb76883af9ae9ed18de566e5c0389eac;p=util-vserver.git diff --git a/util-vserver/scripts/vrpm-preload b/util-vserver/scripts/vrpm-preload index c5ef7d8..1036e5c 100755 --- a/util-vserver/scripts/vrpm-preload +++ b/util-vserver/scripts/vrpm-preload @@ -18,9 +18,9 @@ set -e -: ${UTIL_VSERVER_VARS:=$(dirname $0)/util-vserver-vars} +: ${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; aborting..." >&2 exit 1 } . "$UTIL_VSERVER_VARS" @@ -36,7 +36,7 @@ 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/rpmi ""; do +for bin in `which rpm` /bin/rpm /usr/lib/rpm/rpm${RPM_FLAVOR:-i} ""; do ldd "$bin" &>/dev/null && break done @@ -49,6 +49,6 @@ test "$bin" || { #RPM_FAKE_S_CONTEXT_NR=$scall_nr \ RPM_FAKE_CHROOT=$vdir \ RPM_FAKE_CTX=$ctx \ -RPM_FAKE_CAP=$[ ~0x3404040f ] \ +RPM_FAKE_CAP=$[ ~0xd40c04ff ] \ LD_PRELOAD=$lib${LD_PRELOAD:+:$LD_PRELOAD} \ exec $bin "$@"