diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-10-13 15:41:58 +0200 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-10-13 17:35:56 +0200 |
commit | 3875dcdfeba0d120bf88ac42e3e863c5cf0223d4 (patch) | |
tree | 8f27268c2d454c67294eb095e8f9a3dd4ce201a6 /nixos | |
parent | 57804f44ec2068f74f0b79a090adce99a75a92fc (diff) | |
download | nixlib-3875dcdfeba0d120bf88ac42e3e863c5cf0223d4.tar nixlib-3875dcdfeba0d120bf88ac42e3e863c5cf0223d4.tar.gz nixlib-3875dcdfeba0d120bf88ac42e3e863c5cf0223d4.tar.bz2 nixlib-3875dcdfeba0d120bf88ac42e3e863c5cf0223d4.tar.lz nixlib-3875dcdfeba0d120bf88ac42e3e863c5cf0223d4.tar.xz nixlib-3875dcdfeba0d120bf88ac42e3e863c5cf0223d4.tar.zst nixlib-3875dcdfeba0d120bf88ac42e3e863c5cf0223d4.zip |
nixos-generate-config: Emit boot.initrd.availableKernelModules instead of kerneLmodules
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/modules/installer/tools/nixos-generate-config.pl | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl index 9ce2cab79b0b..ff9bdcdbc00a 100644 --- a/nixos/modules/installer/tools/nixos-generate-config.pl +++ b/nixos/modules/installer/tools/nixos-generate-config.pl @@ -105,7 +105,7 @@ sub pciCheck { $class =~ /^0x0c03/ ) { - push @initrdKernelModules, $module; + push @initrdAvailableKernelModules, $module; } } @@ -174,7 +174,7 @@ sub usbCheck { ($class eq "03" && $protocol eq "01") ) { - push @initrdKernelModules, $module; + push @initrdAvailableKernelModules, $module; } } } @@ -192,7 +192,7 @@ foreach my $path (glob "/sys/class/block/*") { if (-e "$path/device/driver/module") { $module = basename `readlink -f $path/device/driver/module`; chomp $module; - push @initrdKernelModules, $module; + push @initrdAvailableKernelModules, $module; } } @@ -313,7 +313,7 @@ sub multiLineList { return $res; } -my $initrdKernelModules = toNixExpr(uniq @initrdKernelModules); +my $initrdAvailableKernelModules = toNixExpr(uniq @initrdAvailableKernelModules); my $kernelModules = toNixExpr(uniq @kernelModules); my $modulePackages = toNixExpr(uniq @modulePackages); @@ -330,7 +330,7 @@ write_file($fn, <<EOF); { imports = ${\multiLineList(" ", @imports)}; - boot.initrd.kernelModules = [$initrdKernelModules ]; + boot.initrd.availableKernelModules = [$initrdAvailableKernelModules ]; boot.kernelModules = [$kernelModules ]; boot.extraModulePackages = [$modulePackages ]; |