diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-12-27 18:09:48 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-12-27 18:09:48 +0100 |
| commit | 22d2b84f0f76acc11c57c71ded207e2653bbef33 (patch) | |
| tree | a8035c3eca8d6865fcd1a6949347a999463ecdf7 /nixos/modules/installer | |
| parent | 0a1dc96ada214bb61ee867030b3bd9797f57b356 (diff) | |
| parent | 167e748d94aff9957d7f064a54fbc70153c8ff03 (diff) | |
| download | nixlib-22d2b84f0f76acc11c57c71ded207e2653bbef33.tar nixlib-22d2b84f0f76acc11c57c71ded207e2653bbef33.tar.gz nixlib-22d2b84f0f76acc11c57c71ded207e2653bbef33.tar.bz2 nixlib-22d2b84f0f76acc11c57c71ded207e2653bbef33.tar.lz nixlib-22d2b84f0f76acc11c57c71ded207e2653bbef33.tar.xz nixlib-22d2b84f0f76acc11c57c71ded207e2653bbef33.tar.zst nixlib-22d2b84f0f76acc11c57c71ded207e2653bbef33.zip | |
Merge master into staging-next
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) |