X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fscripts%2Fvserver-build.apt-rpm;h=f44391c0a7a6c54a231a7a8ba56f3bc279923d6d;hb=ba02066b569340ffb5a74184caceeb67fe87ac1c;hp=3e79bca011d29cad5abfb7c531cee269d6ebb336;hpb=a4b2a95433eac5b36550fb7683194c849adad3bd;p=util-vserver.git diff --git a/util-vserver/scripts/vserver-build.apt-rpm b/util-vserver/scripts/vserver-build.apt-rpm index 3e79bca..f44391c 100644 --- a/util-vserver/scripts/vserver-build.apt-rpm +++ b/util-vserver/scripts/vserver-build.apt-rpm @@ -50,8 +50,12 @@ 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.initDB "$SETUP_CONFDIR" +rpm.importGPGPubKeys "$SETUP_CONFDIR" \ + "$__CONFDIR/.distributions/$DISTRIBUTION/pubkeys" \ + "$__CONFDIR/.distributions/.common/pubkeys" \ + "$__DISTRIBDIR/$DISTRIBUTION/pubkeys" + $_VAPT_GET "$SETUP_CONFDIR" -- update apt.installBasePackages "$SETUP_CONFDIR" "$PKGINSTALLDIR" $_VAPT_GET "$SETUP_CONFDIR" -- dist-upgrade -y