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/install | |
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/install')
-rw-r--r-- | perl-install/install/NEWS | 1 | ||||
-rw-r--r-- | perl-install/install/any.pm | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index ddb6ae896..85bf6207c 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,4 @@ +- don't install nonfree graphics drivers when not wanted (mga#24172) - don't select default bootloader when building Live ISOs - improve exitInstall message (mga#24046) diff --git a/perl-install/install/any.pm b/perl-install/install/any.pm index 8111d10f3..e8d905651 100644 --- a/perl-install/install/any.pm +++ b/perl-install/install/any.pm @@ -403,7 +403,7 @@ sub is_firmware_needed_ { 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); + my @xpkgs = pkgs::detect_graphical_drivers($o->do_pkgs, undef, 'firmware-only'); log::l("the following nonfree firmware(s) are needed for X.org: " . join(', ', @xpkgs)) if @xpkgs; my $need_microcode = detect_devices::hasCPUMicrocode(); |