summaryrefslogtreecommitdiffstats
path: root/perl-install/install/any.pm
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2018-11-28 01:05:14 +0100
committerThierry Vignaud <thierry.vignaud@gmail.com>2018-11-28 02:03:43 +0100
commitc253952df2d4fb6c41b8ef44edb70cd24fafa4db (patch)
treef75059b6e2cbd9cc473950cd3d07f5e697606c38 /perl-install/install/any.pm
parent7a6433a3a5a908b4de30bda17cfc7b4fdd6d7dc8 (diff)
downloaddrakx-c253952df2d4fb6c41b8ef44edb70cd24fafa4db.tar
drakx-c253952df2d4fb6c41b8ef44edb70cd24fafa4db.tar.gz
drakx-c253952df2d4fb6c41b8ef44edb70cd24fafa4db.tar.bz2
drakx-c253952df2d4fb6c41b8ef44edb70cd24fafa4db.tar.xz
drakx-c253952df2d4fb6c41b8ef44edb70cd24fafa4db.zip
only install radeon-firmware if needed (mga#23911)
aka if there's an ATI gfx card It would be better to use the FIRMWARE field from ldetect-lst XFdrake is supposed to handle it but for minimal installs w/o Xorg (mga#15203) 'microcode_ctl' could be later handled like 'microcode'
Diffstat (limited to 'perl-install/install/any.pm')
-rw-r--r--perl-install/install/any.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/install/any.pm b/perl-install/install/any.pm
index 0e4d4e880..005e29205 100644
--- a/perl-install/install/any.pm
+++ b/perl-install/install/any.pm
@@ -409,7 +409,7 @@ sub is_firmware_needed_ {
my $need_microcode = detect_devices::hasCPUMicrocode();
log::l("nonfree firmware is needed for the CPU (microcode)") if $need_microcode;
- @need || @xpkgs || $need_microcode;
+ if_(@need, 'kernel-firmware-nonfree'), @xpkgs, if_($need_microcode, 'microcode');
}
=item is_firmware_needed($o)
@@ -845,7 +845,7 @@ sub default_packages {
add_n_log("have crypted DM", "cryptsetup") if !is_empty_array_ref($o->{all_hds}{dmcrypts});
add_n_log("some disks are fake RAID", qw(mdadm dmraid)) if any { fs::type::is_dmraid($_) } @{$o->{all_hds}{hds}};
add_n_log("CPU needs microcode", "microcode_ctl") if detect_devices::hasCPUMicrocode();
- add_n_log("either CPU or GFX needs firmware", qw(kernel-firmware-nonfree radeon-firmware)) if is_firmware_needed($o);
+ add_n_log("either CPU or GFX needs firmware", is_firmware_needed_($o)) if is_firmware_needed($o);
add_n_log("CPU needs cpupower", 'cpupower') if detect_devices::hasCPUFreq();
add_n_log("APM support needed", 'apmd') if -e "/proc/apm";
add_n_log("needed by hardware", detect_devices::probe_name('Pkg'));