From a4b2a95433eac5b36550fb7683194c849adad3bd Mon Sep 17 00:00:00 2001 From: Enrico Scholz Date: Fri, 25 Feb 2005 20:51:33 +0000 Subject: [PATCH] avoid ambiguous usage of $PKGDIR, use $PKGINSTALLDIR instead of git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@1864 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- util-vserver/scripts/vserver-build.apt-rpm | 2 +- util-vserver/scripts/vserver-build.yum | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/util-vserver/scripts/vserver-build.apt-rpm b/util-vserver/scripts/vserver-build.apt-rpm index a377dfe..3e79bca 100644 --- a/util-vserver/scripts/vserver-build.apt-rpm +++ b/util-vserver/scripts/vserver-build.apt-rpm @@ -53,7 +53,7 @@ test -z "$BUILD_INITPRE" || "$BUILD_INITPRE" "$SETUP_CONFDIR" "$UTIL_VSERVER_V rpm.importGPGPubKeys "$SETUP_CONFDIR" "$CONFDIR/.distributions/$DISTRIBUTION/pubkeys" "$DISTRIBDIR/$DISTRIBUTION/pubkeys" rpm.initDB "$SETUP_CONFDIR" $_VAPT_GET "$SETUP_CONFDIR" -- update -apt.installBasePackages "$SETUP_CONFDIR" "$PKGDIR" +apt.installBasePackages "$SETUP_CONFDIR" "$PKGINSTALLDIR" $_VAPT_GET "$SETUP_CONFDIR" -- dist-upgrade -y $_VAPT_GET "$SETUP_CONFDIR" -- clean test -z "$BUILD_INITPOST" || "$BUILD_INITPOST" "$SETUP_CONFDIR" "$UTIL_VSERVER_VARS" diff --git a/util-vserver/scripts/vserver-build.yum b/util-vserver/scripts/vserver-build.yum index f8df080..a9ea210 100644 --- a/util-vserver/scripts/vserver-build.yum +++ b/util-vserver/scripts/vserver-build.yum @@ -52,6 +52,6 @@ setup_writeInitialFstab test -z "$BUILD_INITPRE" || "$BUILD_INITPRE" "$SETUP_CONFDIR" "$UTIL_VSERVER_VARS" rpm.importGPGPubKeys "$SETUP_CONFDIR" "$CONFDIR/.distributions/$DISTRIBUTION/pubkeys" "$DISTRIBDIR/$DISTRIBUTION/pubkeys" rpm.initDB "$SETUP_CONFDIR" -yum.installBasePackages "$SETUP_CONFDIR" "$PKGDIR" +yum.installBasePackages "$SETUP_CONFDIR" "$PKGINSTALLDIR" $_VYUM "$SETUP_CONFDIR" -- clean all test -z "$BUILD_INITPOST" || "$BUILD_INITPOST" "$SETUP_CONFDIR" "$UTIL_VSERVER_VARS" -- 1.8.1.5