added 'novlandev' interface flag
[util-vserver.git] / util-vserver / scripts / vserver-build.yum
index f8df080..8fccd40 100644 (file)
@@ -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