public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos ISO image: revert a part of 8ca33835ba

Browse Source 
Thanks @ primeos.  This wasn't really needed; my mistake.
This commit is contained in:
Vladimír Čunát 2021-01-13 14:50:40 +01:00
parent 8ca33835ba
commit 1a16428c17
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nixos/modules/installer/cd-dvd/iso-image.nix
View File

@ -397,8 +397,6 @@ let
# Syslinux (and isolinux) only supports x86-based architectures. # Syslinux (and isolinux) only supports x86-based architectures.
canx86BiosBoot = pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64; 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 in
{ {
@ -617,11 +615,9 @@ in
]; ];
}; };
boot.initrd.availableKernelModules = [ "iso9660" "uas" "overlay" ] boot.initrd.availableKernelModules = [ "squashfs" "iso9660" "uas" "overlay" ];
++ maybeInitrdModules [ "squashfs" ];
boot.initrd.kernelModules = [ "overlay" ] boot.initrd.kernelModules = [ "loop" "overlay" ];
++ maybeInitrdModules [ "loop" ];
# Closures to be copied to the Nix store on the CD, namely the init # Closures to be copied to the Nix store on the CD, namely the init
# script and the top-level system configuration directory. # 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 # Add vfat support to the initrd to enable people to copy the
# contents of the CD to a bootable USB stick. # contents of the CD to a bootable USB stick.
boot.initrd.supportedFilesystems = maybeInitrdModules [ "vfat" ]; boot.initrd.supportedFilesystems = [ "vfat" ];
}; };