For non-local media, iurt is suppressing the urpmi.cfg file while creating

the chroot. This has the side effect of forcing people to use things like
--chrooted-urpmi even if the iurt configuration is fine (since it managed
to create the chroot). So, add media while creating the build chroot for
non-local media, as long as --chrooted-urpmi has not been used.

1 files changed, 14 insertions, 2 deletions

diff --git a/lib/Iurt/Chroot.pm b/lib/Iurt/Chroot.pm
index 67f93ff..ba87464 100644
--- a/lib/Iurt/Chroot.pm
+++ b/lib/Iurt/Chroot.pm
@@ -300,11 +300,23 @@ sub check_chroot_need_update {
 
 sub create_build_chroot {
     my ($chroot, $chroot_ref, $run, $config) = @_;
+    my $ret = 0;
     if ($run->{storage} eq 'btrfs') {
-        return create_build_chroot_btrfs($chroot, $chroot_ref, $run, $config);
+        $ret = create_build_chroot_btrfs($chroot, $chroot_ref, $run, $config);
     } else {
-        return create_build_chroot_tar($chroot, $chroot_ref, $run, $config);
+        $ret = create_build_chroot_tar($chroot, $chroot_ref, $run, $config);
     }
+
+    if ($ret) {
+        my $urpmi = $run->{urpmi};
+        if ($urpmi->{use__urpmi_root} && !$run->{chrooted_urpmi}) {
+	    if (!$urpmi->add_media__urpmi_root($chroot, $config->{base_media})) {
+	        plog('ERROR', "urpmi.addmedia --urpmi-root failed");
+	        return;
+	    }
+        }
+    }
+    return $ret;
 }
 
 sub create_build_chroot_tar {