4 files changed, 5 insertions, 4 deletions
diff --git a/modules/buildsystem/manifests/media_cfg.pp b/modules/buildsystem/manifests/media_cfg.pp
index 327468e3..9a29322c 100644
--- a/modules/buildsystem/manifests/media_cfg.pp
+++ b/modules/buildsystem/manifests/media_cfg.pp
@@ -3,7 +3,7 @@ define buildsystem::media_cfg($distro, $arch, $templatefile = 'buildsystem/media
     include buildsystem::var::scheduler
     include buildsystem::repository
     
-    file { "${buildsystem::var::repository::bootstrap_reporoot}/distrib/${distro}/${arch}/media/media_info/media.cfg":
+    file { "${buildsystem::var::repository::bootstrap_reporoot}/${distro}/${arch}/media/media_info/media.cfg":
         owner  => $buildsystem::base::sched_login,
         group  => $buildsystem::base::sched_login,
 	content => template($templatefile),
diff --git a/modules/buildsystem/manifests/repository.pp b/modules/buildsystem/manifests/repository.pp
index 3b0c100d..cfa2f3fd 100644
--- a/modules/buildsystem/manifests/repository.pp
+++ b/modules/buildsystem/manifests/repository.pp
@@ -1,5 +1,5 @@
 class buildsystem::repository {
-   file { $buildsystem::var::repository::bootstrap_reporoot:
+   file { $buildsystem::var::repository::bootstrap_root:
         ensure => directory,
    }
 }
diff --git a/modules/buildsystem/manifests/var/repository.pp b/modules/buildsystem/manifests/var/repository.pp
index ebf3e3d9..22bc3344 100644
--- a/modules/buildsystem/manifests/var/repository.pp
+++ b/modules/buildsystem/manifests/var/repository.pp
@@ -1,7 +1,8 @@
 class buildsystem::var::repository(
-    $bootstrap_reporoot = '/distrib/bootstrap',
+    $bootstrap_root = '/distrib/bootstrap',
     $mirror_root = '/distrib/mirror',
     $distribdir = 'distrib',
 ) {
+    $bootstrap_reporoot = "${bootstrap_root}/${distribdir}"
     $mirror_reporoot = "${mirror_root}/${distribdir}"
 }
diff --git a/modules/buildsystem/manifests/youri_submit.pp b/modules/buildsystem/manifests/youri_submit.pp
index 84b283e9..5b02a067 100644
--- a/modules/buildsystem/manifests/youri_submit.pp
+++ b/modules/buildsystem/manifests/youri_submit.pp
@@ -4,7 +4,7 @@ class buildsystem::youri_submit {
     include buildsystem::repository
     include buildsystem::var::scheduler
 
-    $repository_root = $buildsystem::var::repository::bootstrap_reporoot
+    $repository_root = $buildsystem::var::repository::bootstrap_root
     $sched_home_dir = $buildsystem::var::scheduler::homedir
     $sched_login = $buildsystem::var::scheduler::login
     $packages_archivedir = "$sched_home_dir/old"