From 045b5965c34ffc1e18d01297f351d8fdb3e72c67 Mon Sep 17 00:00:00 2001 From: Martin Whitaker Date: Sat, 2 Feb 2019 20:48:42 +0000 Subject: Don't install nonfree graphics drivers when not wanted (mga#24172) This fixes a bug introduced by commit c253952df2. That was only supposed to select GPU firmware packages, but actually selected driver packages as well. --- perl-install/pkgs.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'perl-install/pkgs.pm') diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm index 9a63037ec..504e30705 100644 --- a/perl-install/pkgs.pm +++ b/perl-install/pkgs.pm @@ -172,7 +172,7 @@ sub detect_rpmsrate_hardware_packages { } sub detect_graphical_drivers { - my ($do_pkgs, $o_match_all_hardware) = @_; + my ($do_pkgs, $o_match_all_hardware, $o_firmware_only) = @_; require Xconfig::card; require Xconfig::proprietary; @@ -185,6 +185,7 @@ sub detect_graphical_drivers { } my @firmware_pkgs = grep { $_ } uniq(map { $_->{FIRMWARE} } @cards); + return @firmware_pkgs if $o_firmware_only; my @drivers = grep { $_ } uniq(map { $_->{Driver2} } @cards); my @proprietary_pkgs = map { Xconfig::proprietary::pkgs_for_Driver2($_, $do_pkgs) } @drivers; return @firmware_pkgs, @proprietary_pkgs; -- cgit v1.2.1