From 7d6fe2c85990bd9857eceb2bfb68fd4b393d3715 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Fri, 20 Mar 2015 07:16:12 +0100
Subject: better fix for draklive vs media screen

better than commit f4e7b5e6c505ecbcef14ecbb26507f0159bad32b
---
 perl-install/install/any.pm | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/perl-install/install/any.pm b/perl-install/install/any.pm
index f6a106553..c6a226e7e 100644
--- a/perl-install/install/any.pm
+++ b/perl-install/install/any.pm
@@ -420,7 +420,6 @@ Is a firmware needed by some HW?
 
 sub is_firmware_needed {
     my ($o) = @_;
-    return 0 if $::o->{match_all_hardware};
     state $res;
     $res = is_firmware_needed_($o) if !defined $res;
     $res;
@@ -577,7 +576,7 @@ sub setPackages {
 	}
 
         install::pkgs::start_pushing_error();
-        media_screen($o) if !$::auto_install;
+        media_screen($o) if !$::auto_install && !$::o->{match_all_hardware};
         my @choosen_media = map { $_->{name} } grep { !$_->{ignore} } @{$urpm->{media}};
         log::l("choosen media: ", join(', ', @choosen_media));
         die "no choosen media" if !@choosen_media;
-- 
cgit v1.2.1