diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-12-27 18:11:34 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-12-27 18:11:34 +0100 |
| commit | 10afccf1455167972b559f32b3b1495a07593cf1 (patch) | |
| tree | b0f0d3e167586472e629f336337a1e15f750a318 /nixos/modules/installer | |
| parent | e039310f9673d8e4d4975c0aa97e7b294536e4b5 (diff) | |
| parent | 22d2b84f0f76acc11c57c71ded207e2653bbef33 (diff) | |
| download | nixlib-10afccf1455167972b559f32b3b1495a07593cf1.tar nixlib-10afccf1455167972b559f32b3b1495a07593cf1.tar.gz nixlib-10afccf1455167972b559f32b3b1495a07593cf1.tar.bz2 nixlib-10afccf1455167972b559f32b3b1495a07593cf1.tar.lz nixlib-10afccf1455167972b559f32b3b1495a07593cf1.tar.xz nixlib-10afccf1455167972b559f32b3b1495a07593cf1.tar.zst nixlib-10afccf1455167972b559f32b3b1495a07593cf1.zip | |
Merge staging-next into staging
Diffstat (limited to 'nixos/modules/installer')
| -rw-r--r-- | nixos/modules/installer/cd-dvd/sd-image-aarch64-new-kernel.nix | 7 | ||||
| -rw-r--r-- | nixos/modules/installer/cd-dvd/sd-image-aarch64.nix | 1 |
2 files changed, 7 insertions, 1 deletions
diff --git a/nixos/modules/installer/cd-dvd/sd-image-aarch64-new-kernel.nix b/nixos/modules/installer/cd-dvd/sd-image-aarch64-new-kernel.nix new file mode 100644 index 000000000000..2882fbcc7305 --- /dev/null +++ b/nixos/modules/installer/cd-dvd/sd-image-aarch64-new-kernel.nix @@ -0,0 +1,7 @@ +{ pkgs, ... }: + +{ + imports = [ ./sd-image-aarch64.nix ]; + + boot.kernelPackages = pkgs.linuxPackages_latest; +} diff --git a/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix b/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix index 86e19f3da562..2db71eb20c5d 100644 --- a/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix +++ b/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix @@ -26,7 +26,6 @@ in boot.loader.generic-extlinux-compatible.enable = true; boot.consoleLogLevel = lib.mkDefault 7; - boot.kernelPackages = pkgs.linuxPackages_latest; # The serial ports listed here are: # - ttyS0: for Tegra (Jetson TX1) |