X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fscripts%2Fvserver-build.yum;h=8fccd40e2d357f208e6d11ea4cfbb967d5db5c85;hb=dfa40e043f50b3ed0f89cdec01d0655c94c1e12e;hp=f8df080bdd8a994429dfa0b62f9b11534c9ef445;hpb=39b582d8b6989c85013038f383b4ff291a04db75;p=util-vserver.git diff --git a/util-vserver/scripts/vserver-build.yum b/util-vserver/scripts/vserver-build.yum index f8df080..8fccd40 100644 --- a/util-vserver/scripts/vserver-build.yum +++ b/util-vserver/scripts/vserver-build.yum @@ -36,11 +36,14 @@ done getDistribution -base.initVariables +base.init pkgmgmt.initVariables rpm.initVariables yum.initVariables +rpm.sanityCheck + + base.initFilesystem "$OPTION_FORCE" pkgmgmt.initFilesystem "$OPTION_FORCE" rpm.initFilesystem @@ -50,8 +53,13 @@ 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" -yum.installBasePackages "$SETUP_CONFDIR" "$PKGDIR" +rpm.importGPGPubKeys "$SETUP_CONFDIR" \ + "$__CONFDIR/.distributions/$DISTRIBUTION/pubkeys" \ + "$__CONFDIR/.distributions/.common/pubkeys" \ + "$__DISTRIBDIR/$DISTRIBUTION/pubkeys" +yum.installBasePackages "$SETUP_CONFDIR" "$PKGINSTALLDIR" $_VYUM "$SETUP_CONFDIR" -- clean all test -z "$BUILD_INITPOST" || "$BUILD_INITPOST" "$SETUP_CONFDIR" "$UTIL_VSERVER_VARS" + +base.setSuccess