Attachment 9883 Details for Bug 22346 – Patch to support ChooseMedia step in auto-install interactiveSteps

Patch to support ChooseMedia step in auto-install interactiveSteps

0001-installer-support-ChooseMedia-in-auto-install-intera.patch (text/plain), 945 bytes, created by Martin Whitaker on 2018-01-07 23:04:59 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Whitaker

Created: 2018-01-07 23:04:59 CET

Size: 945 bytes

patch

obsolete

From 28869bcf0f60884c9856b39bca72f8cf3ce131cb Mon Sep 17 00:00:00 2001
From: Martin Whitaker <mageia@martin-whitaker.me.uk>
Date: Sun, 7 Jan 2018 21:17:11 +0000
Subject: [PATCH 1/3] installer: support ChooseMedia in auto-install
 interactiveSteps.


diff --git a/perl-install/install/any.pm b/perl-install/install/any.pm
index 8eb0d91a1..c2bc4c909 100644
--- a/perl-install/install/any.pm
+++ b/perl-install/install/any.pm
@@ -588,7 +588,7 @@ sub setPackages {
 	        $medium->{temp_enabled} = member($medium->{name}, @{$o->{enabled_media}});
 	    }
         }
-        media_screen($o) if !$::auto_install && !$::o->{match_all_hardware};
+        media_screen($o) if !$::auto_install || member('chooseMedia', @{$::o->{interactiveSteps}});
         enable_choosen_media($o);
         my @choosen_media = map { $_->{name} } grep { !$_->{ignore} } @{$urpm->{media}};
         log::l("choosen media: ", join(', ', @choosen_media));
-- 
2.13.6

Actions: View

Attachments on bug 22346: 9883 | 9884 | 9885 | 10042