From 45fab492fc0794a81bf8e81408734a504beff3d1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 10 Mar 2012 14:35:31 +0000
Subject: [PATCH] * 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
---
 modules/installer/tools/nixos-hardware-scan.pl | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/modules/installer/tools/nixos-hardware-scan.pl b/modules/installer/tools/nixos-hardware-scan.pl
index f123303e748..b81eeaa90e4 100644
--- a/modules/installer/tools/nixos-hardware-scan.pl
+++ b/modules/installer/tools/nixos-hardware-scan.pl
@@ -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 ];