summaryrefslogtreecommitdiffstats
path: root/perl-install/install
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2013-12-20 16:14:56 +0100
committerThierry Vignaud <thierry.vignaud@gmail.com>2013-12-20 16:16:42 +0100
commitb4ce4dc30caf0106ba74025e4fccc1902d73860b (patch)
tree611ee7b32c2177f619eae27e78a1a711630a5a9a /perl-install/install
parent4538fce2c82a8d500f907709cbd68669ba446be6 (diff)
downloaddrakx-b4ce4dc30caf0106ba74025e4fccc1902d73860b.tar
drakx-b4ce4dc30caf0106ba74025e4fccc1902d73860b.tar.gz
drakx-b4ce4dc30caf0106ba74025e4fccc1902d73860b.tar.bz2
drakx-b4ce4dc30caf0106ba74025e4fccc1902d73860b.tar.xz
drakx-b4ce4dc30caf0106ba74025e4fccc1902d73860b.zip
hint that nonfree is needed if a CPU needs a microcode
Diffstat (limited to 'perl-install/install')
-rw-r--r--perl-install/install/NEWS2
-rw-r--r--perl-install/install/any.pm6
2 files changed, 7 insertions, 1 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 8744fb7df..88532bfbd 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,5 @@
+- media step:
+ o hint that nonfree is needed if a CPU needs a microcode
- drakx-in-chroot:
o advise to install xephyr if missing
diff --git a/perl-install/install/any.pm b/perl-install/install/any.pm
index 217080202..9bad240c2 100644
--- a/perl-install/install/any.pm
+++ b/perl-install/install/any.pm
@@ -333,7 +333,11 @@ sub is_firmware_needed_ {
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;
- @need || @xpkgs;
+
+ my $need_microcode = detect_devices::hasCPUMicrocode();
+ log::l("nonfree firmware is needed for the CPU (microcode)") if $need_microcode;
+
+ @need || @xpkgs || $need_microcode;
}
sub is_firmware_needed {