git.iko.soy/typeable/nixpkgs
on master help sign in
nixos ISO image: revert a part of 8ca33835ba

Thanks @ primeos. This wasn't really needed; my mistake.

commit1a16428c172abc6f61ead6133dd639d10d720905 authorVladimír Čunát <v@cunat.cz> dateWed 13 Jan 2021, 14:50 (6 years ago) parent8ca3383
1 file changed+3−7
nixos/modules/installer/cd-dvd/iso-image.nix+3−7
nixos/modules/installer/cd-dvd/iso-image.nix+3−7
@@ -397,8 +397,6 @@ let
397397 # Syslinux (and isolinux) only supports x86-based architectures.
398398 canx86BiosBoot = pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64;
399399
400− # Some modules apparently aren't present on our aarch64 (and maybe elsewhere).
401− maybeInitrdModules = lib.optionals (!pkgs.stdenv.hostPlatform.isAarch64);
402400in
403401
404402{
@@ -617,11 +615,9 @@ in
617615 ];
618616 };
619617
620− boot.initrd.availableKernelModules = [ "iso9660" "uas" "overlay" ]
621− ++ maybeInitrdModules [ "squashfs" ];
618+ boot.initrd.availableKernelModules = [ "squashfs" "iso9660" "uas" "overlay" ];
622619
623− boot.initrd.kernelModules = [ "overlay" ]
624− ++ maybeInitrdModules [ "loop" ];
620+ boot.initrd.kernelModules = [ "loop" "overlay" ];
625621
626622 # Closures to be copied to the Nix store on the CD, namely the init
627623 # script and the top-level system configuration directory.
@@ -720,7 +716,7 @@ in
720716
721717 # Add vfat support to the initrd to enable people to copy the
722718 # contents of the CD to a bootable USB stick.
723− boot.initrd.supportedFilesystems = maybeInitrdModules [ "vfat" ];
719+ boot.initrd.supportedFilesystems = [ "vfat" ];
724720
725721 };
726722