aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Vigier <boklm@mageia.org>2013-05-29 22:48:28 +0000
committerNicolas Vigier <boklm@mageia.org>2013-05-29 22:48:28 +0000
commitfe90d8bf012932b23fe77ccdf4d6524e16ed26b2 (patch)
tree7077cbdf1db052c16424567d1fbc3282ac58e201
parentf28bf7c0ee4036d8ac77ea67e0878b0463dc316d (diff)
downloadpuppet-fe90d8bf012932b23fe77ccdf4d6524e16ed26b2.tar
puppet-fe90d8bf012932b23fe77ccdf4d6524e16ed26b2.tar.gz
puppet-fe90d8bf012932b23fe77ccdf4d6524e16ed26b2.tar.bz2
puppet-fe90d8bf012932b23fe77ccdf4d6524e16ed26b2.tar.xz
puppet-fe90d8bf012932b23fe77ccdf4d6524e16ed26b2.zip
buildsystem: Add option 'no_media_cfg_update'
Option to disable generation of media.cfg for a distro.
-rw-r--r--modules/buildsystem/manifests/distros.rb6
-rw-r--r--modules/buildsystem/manifests/var/distros.pp2
2 files changed, 6 insertions, 2 deletions
diff --git a/modules/buildsystem/manifests/distros.rb b/modules/buildsystem/manifests/distros.rb
index 965ce5ab..c7630e10 100644
--- a/modules/buildsystem/manifests/distros.rb
+++ b/modules/buildsystem/manifests/distros.rb
@@ -21,8 +21,10 @@ hostclass "buildsystem::distros" do
if distro['tmpl_media.cfg'] != nil
media_cfg_args['templatefile'] = distro['tmpl_media.cfg']
end
- create_resource 'buildsystem::media_cfg',
- [ rel, ' ', arch ].join('/'), media_cfg_args
+ if ! distro['no_media_cfg_update']
+ create_resource 'buildsystem::media_cfg',
+ [ rel, ' ', arch ].join('/'), media_cfg_args
+ end
file [ bootstrap_reporoot, rel, arch ].join('/'),
:ensure => 'directory', :owner => mirror_user,
:group => mirror_user
diff --git a/modules/buildsystem/manifests/var/distros.pp b/modules/buildsystem/manifests/var/distros.pp
index e1079e40..7bb16cfb 100644
--- a/modules/buildsystem/manifests/var/distros.pp
+++ b/modules/buildsystem/manifests/var/distros.pp
@@ -9,6 +9,8 @@
# 'cauldron' => {
# # list of arch supported by 'cauldron'
# 'arch' => [ 'i586', 'x86_64' ],
+# # Set this if you don't want media.cfg to be generated
+# 'no_media_cfg_update' => true,
# 'medias' => {
# # the 'core' media
# 'core' => {