* nixos-hardware-scan: "acpi-cpufreq" is automatically loaded, so we

don't need to detect it.
* nixos-hardware-scan: don't use modulesPath.

svn path=/nixos/trunk/; revision=32972
This commit is contained in:
Eelco Dolstra 2012-03-10 14:35:31 +00:00
parent de6968c163
commit 45fab492fc

@ -45,10 +45,6 @@ sub hasCPUFeature {
my $cpus = scalar (grep {/^processor\s*:/} (split '\n', $cpuinfo));
# CPU frequency scaling. Not sure about this test.
push @kernelModules, "acpi-cpufreq" if hasCPUFeature "acpi";
# Virtualization support?
push @kernelModules, "kvm-intel" if hasCPUFeature "vmx";
push @kernelModules, "kvm-amd" if hasCPUFeature "svm";
@ -226,11 +222,11 @@ my $attrs = multiLineList(" ", removeDups @attrs);
print <<EOF ;
# This is a generated file. Do not modify!
# Make changes to /etc/nixos/configuration.nix instead.
{ config, pkgs, modulesPath, ... }:
{ config, pkgs, ... }:
{
require = [
"\${modulesPath}/installer/scan/not-detected.nix"
<nixos/modules/installer/scan/not-detected.nix>
];
boot.initrd.kernelModules = [$initrdKernelModules ];