From b9ec191fc1c25468824e2ab6635e72f2d952e4f0 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Fri, 17 May 2013 03:51:45 +0000 Subject: hint that nonfree is needed if a driver needs a nonfree firmware --- perl-install/install/any.pm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'perl-install/install/any.pm') diff --git a/perl-install/install/any.pm b/perl-install/install/any.pm index 3bae857ef..ed9ab1291 100644 --- a/perl-install/install/any.pm +++ b/perl-install/install/any.pm @@ -325,10 +325,15 @@ sub _nonfree_medium() { N("Nonfree Release") } # FIXME: move me in ../any.pm or in harddrake::*, might be needed by rpmdrake/harddrake: sub is_firmware_needed { my ($o) = @_; + require list_firmwares; + my @l = map { $_->{driver} } detect_devices::probeall(); + my @need = intersection(\@l, \@list_firmwares::modules_with_nonfree_firmware); + log::l("the following driver(s) need nonfree firmware(s): " . join(', ', @need)) if @need; + require pkgs; my @xpkgs = pkgs::detect_graphical_drivers($o->do_pkgs); log::l("the following nonfree firmware(s) are needed for X.org: " . join(', ', @xpkgs)) if @xpkgs; - @xpkgs; + @need || @xpkgs; } sub msg_if_firmware_needed { -- cgit v1.2.1