Use default kernel for EFI-related stuff
This commit is contained in:
parent
29588edfe1
commit
0d5ec076d2
|
@ -386,9 +386,6 @@ if ($showHardwareConfig) {
|
||||||
boot.loader.grub.enable = false;
|
boot.loader.grub.enable = false;
|
||||||
boot.loader.gummiboot.enable = true;
|
boot.loader.gummiboot.enable = true;
|
||||||
boot.loader.efi.canTouchEfiVariables = true;
|
boot.loader.efi.canTouchEfiVariables = true;
|
||||||
# !!! Remove this when nixos is on 3.10 or greater by default
|
|
||||||
# EFI booting requires kernel >= 3.10
|
|
||||||
boot.kernelPackages = pkgs.linuxPackages_3_10;
|
|
||||||
EOF
|
EOF
|
||||||
} else {
|
} else {
|
||||||
$bootLoaderConfig = <<EOF;
|
$bootLoaderConfig = <<EOF;
|
||||||
|
|
|
@ -38,7 +38,6 @@ let
|
||||||
config = builtins.toFile "configuration.nix" ''
|
config = builtins.toFile "configuration.nix" ''
|
||||||
{ pkgs, ... }: {
|
{ pkgs, ... }: {
|
||||||
imports = [ ./hardware-configuration.nix <nixos/modules/testing/test-instrumentation.nix> ];
|
imports = [ ./hardware-configuration.nix <nixos/modules/testing/test-instrumentation.nix> ];
|
||||||
boot.kernelPackages = pkgs.linuxPackages_3_10;
|
|
||||||
boot.loader.grub.enable = false;
|
boot.loader.grub.enable = false;
|
||||||
boot.loader.efi.canTouchEfiVariables = true;
|
boot.loader.efi.canTouchEfiVariables = true;
|
||||||
boot.loader.gummiboot.enable = true;
|
boot.loader.gummiboot.enable = true;
|
||||||
|
|
Loading…
Reference in a new issue