From 1a16428c172abc6f61ead6133dd639d10d720905 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 13 Jan 2021 14:50:40 +0100 Subject: [PATCH] nixos ISO image: revert a part of 8ca33835ba Thanks @ primeos. This wasn't really needed; my mistake. --- nixos/modules/installer/cd-dvd/iso-image.nix | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix index c2faf5abd84..43d20a556f8 100644 --- a/nixos/modules/installer/cd-dvd/iso-image.nix +++ b/nixos/modules/installer/cd-dvd/iso-image.nix @@ -397,8 +397,6 @@ let # Syslinux (and isolinux) only supports x86-based architectures. canx86BiosBoot = pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64; - # Some modules apparently aren't present on our aarch64 (and maybe elsewhere). - maybeInitrdModules = lib.optionals (!pkgs.stdenv.hostPlatform.isAarch64); in { @@ -617,11 +615,9 @@ in ]; }; - boot.initrd.availableKernelModules = [ "iso9660" "uas" "overlay" ] - ++ maybeInitrdModules [ "squashfs" ]; + boot.initrd.availableKernelModules = [ "squashfs" "iso9660" "uas" "overlay" ]; - boot.initrd.kernelModules = [ "overlay" ] - ++ maybeInitrdModules [ "loop" ]; + boot.initrd.kernelModules = [ "loop" "overlay" ]; # Closures to be copied to the Nix store on the CD, namely the init # script and the top-level system configuration directory. @@ -720,7 +716,7 @@ in # Add vfat support to the initrd to enable people to copy the # contents of the CD to a bootable USB stick. - boot.initrd.supportedFilesystems = maybeInitrdModules [ "vfat" ]; + boot.initrd.supportedFilesystems = [ "vfat" ]; };