From a320a78768074bc35e59b7ce627ba88d16cfd6e8 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Sun, 16 Jan 2022 23:14:53 +0100
Subject: Enable to alter default downloader (mga#28539)

Default is still curl.
Choice is limited to what is actually included in stage2 (for now, only
aria2c, curl or wget)
eg: " downloader=wget"
---
 perl-install/install/NEWS           | 3 +++
 perl-install/install/install2.pm    | 1 +
 perl-install/install/pkgs.pm        | 1 +
 perl-install/install/share/list.xml | 2 +-
 4 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index b67010eeb..1b6978ae6 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,6 @@
+- Enable to alter default downloader (mga#28539)
+  eg: " downloader=wget"
+
 Version 18.47 - 30 October 2021
 
 - Adapt to xserver-21.1
diff --git a/perl-install/install/install2.pm b/perl-install/install/install2.pm
index de48a6dbb..7f6cbd6fe 100644
--- a/perl-install/install/install2.pm
+++ b/perl-install/install/install2.pm
@@ -562,6 +562,7 @@ sub parse_args {
 	    'deploops',
 	    'justdb',
 	    'tune-rpm'     => sub { $o->{'tune-rpm'} = 'all' },
+	    'downloader=s' => sub { $o->{options}{downloader} = $_[1] },
 
 	    # GUI options:
 	    'vga16=s',
diff --git a/perl-install/install/pkgs.pm b/perl-install/install/pkgs.pm
index 2fcd0eccc..0dbd38751 100644
--- a/perl-install/install/pkgs.pm
+++ b/perl-install/install/pkgs.pm
@@ -420,6 +420,7 @@ sub empty_packages {
     urpm::set_tune_rpm($packages, $::o->{'tune-rpm'}) if $::o->{'tune-rpm'};
     $::force = 1;
     $packages->{options}{ignoresize} = 1;
+    $packages->{options}{downloader} = $::o->{options}{downloader};
     # prevent priority upgrade (redundant for now as $urpm->{root} implies disabling it:
     $packages->{options}{'priority-upgrade'} = undef;
     # log $trans->add() faillure; FIXME: should we override *urpm::msg::sys_log?
diff --git a/perl-install/install/share/list.xml b/perl-install/install/share/list.xml
index 7e093783b..949ff2d09 100644
--- a/perl-install/install/share/list.xml
+++ b/perl-install/install/share/list.xml
@@ -2,7 +2,7 @@
 
 <from expand="binary">
   ash dash.static echo
-  aria2c cp curl md5sum <!-- needed by urpmi -->
+  aria2c cp curl md5sum wget <!-- needed by urpmi -->
   cpio gzip bzip2 xz
   grub2-editenv
   insmod modinfo rmmod modprobe lsmod
-- 
cgit v1.2.1