From ac67e993c261ae4bce7570d52d937533b75d3d51 Mon Sep 17 00:00:00 2001 From: Enrico Scholz Date: Thu, 2 Oct 2003 15:23:21 +0000 Subject: [PATCH] added workaround for https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=106057 git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@42 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- util-vserver/scripts/functions | 12 ++++++++++-- util-vserver/scripts/util-vserver-vars.pathsubst | 4 ++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/util-vserver/scripts/functions b/util-vserver/scripts/functions index 959a2aa..655427a 100644 --- a/util-vserver/scripts/functions +++ b/util-vserver/scripts/functions @@ -86,6 +86,12 @@ function _pkgSetVarsBase ;; esac + + if test -z "$WORKAROUND_106057"; then + _rpmdb_mntpoint=/dev + else + _rpmdb_mntpoint=/.rpmdb + fi } function _pkgSetVarsRPM @@ -139,7 +145,9 @@ function _pkgMountRPM { _pkgMountBindDir "$RPMETCDIR" /etc/rpm test "$RPMLIBDIR" = "/" || _pkgMountBindDir "$RPMLIBDIR" /usr/lib/rpm - "$_SECURE_MOUNT" "$VDIR" "$RPMSTATEDIR" /var/lib/rpm + + "$_SECURE_MOUNT" "$VDIR" "$RPMSTATEDIR" "$_rpmdb_mntpoint" + test -z "$WORKAROUND_106057" || mount -n --bind "$RPMSTATEDIR" "$_rpmdb_mntpoint" } function _pkgSetEnvBase @@ -160,7 +168,7 @@ function _pkgSetEnvApt function _pkgSetEnvRPM { CUR_VSERVER=$vserver - RPM_FAKE_NAMESPACE_MOUNTS=/var/lib/rpm + RPM_FAKE_NAMESPACE_MOUNTS=$_rpmdb_mntpoint RPM_BINARY=$_VRPM_PRELOAD export CUR_VSERVER RPM_FAKE_NAMESPACE_MOUNTS RPM_BINARY diff --git a/util-vserver/scripts/util-vserver-vars.pathsubst b/util-vserver/scripts/util-vserver-vars.pathsubst index 6218e1a..63e4a0d 100644 --- a/util-vserver/scripts/util-vserver-vars.pathsubst +++ b/util-vserver/scripts/util-vserver-vars.pathsubst @@ -12,3 +12,7 @@ _VAPT_GET_WORKER="$PKGLIBDIR/vapt-get-worker" _VRPM_WORKER="$PKGLIBDIR/vrpm-worker" _VAPT_GET="$SBINDIR/vapt-get" _RPM_FAKE_SO="$PKGLIBDIR/rpm-fake.so" + + +# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=106057 +WORKAROUND_106057=1 -- 1.8.1.5