summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2015-03-20 07:16:12 +0100
committerThierry Vignaud <thierry.vignaud@gmail.com>2015-12-25 10:34:22 +0100
commit7d6fe2c85990bd9857eceb2bfb68fd4b393d3715 (patch)
tree1a6dacf003185d868bea32cdd8da93055db6b4db
parentf7e8901bc25d665235093fe5a8be2aea706ee3a0 (diff)
downloaddrakx-7d6fe2c85990bd9857eceb2bfb68fd4b393d3715.tar
drakx-7d6fe2c85990bd9857eceb2bfb68fd4b393d3715.tar.gz
drakx-7d6fe2c85990bd9857eceb2bfb68fd4b393d3715.tar.bz2
drakx-7d6fe2c85990bd9857eceb2bfb68fd4b393d3715.tar.xz
drakx-7d6fe2c85990bd9857eceb2bfb68fd4b393d3715.zip
better fix for draklive vs media screen
-rw-r--r--perl-install/install/any.pm3
1 files changed, 1 insertions, 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;