added some magic to avoid warnings with gcc4
[util-vserver.git] / util-vserver / scripts / vserver-build.apt-rpm
index 6f54552..e260a50 100644 (file)
@@ -50,9 +50,10 @@ setup_writeOption "$VSERVER_NAME"
 setup_writeInitialFstab
 
 test -z "$BUILD_INITPRE"  || "$BUILD_INITPRE" "$SETUP_CONFDIR"  "$UTIL_VSERVER_VARS"
-rpm.importGPGPubKeys "$VSERVER_NAME" "$CONFDIR/.distributions/$DISTRIBUTION/pubkeys" "$DISTRIBDIR/$DISTRIBUTION/pubkeys"
-rpm.initDB           "$VSERVER_NAME"
-"$_VAPT_GET" "$SETUP_CONFDIR" -- update
-apt.installBasePackages "$SETUP_CONFDIR" "$PKGDIR"
-"$_VAPT_GET" "$SETUP_CONFDIR" -- dist-upgrade -y
+rpm.importGPGPubKeys "$SETUP_CONFDIR" "$__CONFDIR/.distributions/$DISTRIBUTION/pubkeys" "$__DISTRIBDIR/$DISTRIBUTION/pubkeys"
+rpm.initDB           "$SETUP_CONFDIR"
+$_VAPT_GET "$SETUP_CONFDIR" -- update
+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"