diff options
| author | Pascal Terjan <pterjan@mageia.org> | 2017-10-03 23:17:39 +0100 |
|---|---|---|
| committer | Pascal Terjan <pterjan@mageia.org> | 2017-10-03 23:18:29 +0100 |
| commit | 2d5db438e353a3a396252fa0abd522b0a3a8bfe3 (patch) | |
| tree | 28cf717ec3568f31cbc9b4f7014e4c33a060860c | |
| parent | dd266ff2695155b313526d633744a9061d7616d6 (diff) | |
| download | iurt-2d5db438e353a3a396252fa0abd522b0a3a8bfe3.tar iurt-2d5db438e353a3a396252fa0abd522b0a3a8bfe3.tar.gz iurt-2d5db438e353a3a396252fa0abd522b0a3a8bfe3.tar.bz2 iurt-2d5db438e353a3a396252fa0abd522b0a3a8bfe3.tar.xz iurt-2d5db438e353a3a396252fa0abd522b0a3a8bfe3.zip | |
Use --urpmi-root also for urpmi.addmedia
This allows adding the media without networking inside the chroot
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | lib/Iurt/Urpmi.pm | 10 |
2 files changed, 9 insertions, 3 deletions
@@ -1,3 +1,5 @@ +- iurt: also use --urpmi-root for urpmi.addmedia + 0.7.0 - iurt: support resuming a full rebuild - ulri: improve handling of build failures diff --git a/lib/Iurt/Urpmi.pm b/lib/Iurt/Urpmi.pm index 41186a8..8355a4b 100644 --- a/lib/Iurt/Urpmi.pm +++ b/lib/Iurt/Urpmi.pm @@ -209,15 +209,19 @@ sub add_media { plog("add chroot media: $run->{chrooted_media}"); - if (!perform_command("chroot $chroot urpmi.addmedia $media", + my $cmd = "chroot $chroot urpmi.addmedia $media"; + if ($run->{chrooted_urpmi}) { + $cmd = "urpmi-addmedia -v --urpmi-root $chroot $media"; + } + perform_command($cmd, $run, $config, mail => $config->{admin}, timeout => 300, freq => 1, retry => 2, use_iurt_root_command => 1, - debug_mail => $run->{debug})) { - } + debug_mail => $run->{debug}) + or return; if (!check_media_added($chroot, $regexp)) { plog('ERROR', "ERROR iurt could not add media into the chroot"); return; |