avoid ambiguous usage of $PKGDIR, use $PKGINSTALLDIR instead of
authorEnrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
Fri, 25 Feb 2005 20:51:33 +0000 (20:51 +0000)
committerEnrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
Fri, 25 Feb 2005 20:51:33 +0000 (20:51 +0000)
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
util-vserver/scripts/vserver-build.yum

index a377dfe..3e79bca 100644 (file)
@@ -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"
index f8df080..a9ea210 100644 (file)
@@ -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"