diff options
author | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2019-02-02 20:48:42 +0000 |
---|---|---|
committer | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2019-02-02 22:11:07 +0000 |
commit | 045b5965c34ffc1e18d01297f351d8fdb3e72c67 (patch) | |
tree | bd537566fb89dd0ad5cddf826b60cf1437b0205a /perl-install/pkgs.pm | |
parent | fb936a38c50d999bff1282320bdb66c207e93f08 (diff) | |
download | drakx-045b5965c34ffc1e18d01297f351d8fdb3e72c67.tar drakx-045b5965c34ffc1e18d01297f351d8fdb3e72c67.tar.gz drakx-045b5965c34ffc1e18d01297f351d8fdb3e72c67.tar.bz2 drakx-045b5965c34ffc1e18d01297f351d8fdb3e72c67.tar.xz drakx-045b5965c34ffc1e18d01297f351d8fdb3e72c67.zip |
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.
Diffstat (limited to 'perl-install/pkgs.pm')
-rw-r--r-- | perl-install/pkgs.pm | 3 |
1 files changed, 2 insertions, 1 deletions
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; |