X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fscripts%2Fvserver-build.apt-rpm;h=e260a50a6248e73ccb7920e4b10c9709333ef6d1;hb=02598b80efa142453f5d67be4ea95e3f35d63682;hp=a377dfe2b1ca208049c898d4d88bf9bf6ce8f976;hpb=e051f1f774b2b4809c1c279d8cae25aa86179c6e;p=util-vserver.git diff --git a/util-vserver/scripts/vserver-build.apt-rpm b/util-vserver/scripts/vserver-build.apt-rpm index a377dfe..e260a50 100644 --- a/util-vserver/scripts/vserver-build.apt-rpm +++ b/util-vserver/scripts/vserver-build.apt-rpm @@ -50,10 +50,10 @@ setup_writeOption "$VSERVER_NAME" 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.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"