Commit 71c74bf1 authored by Will Fancher's avatar Will Fancher
Browse files

nixos: Add ext to fsPackages in stage 2 with systemd-initrd enabled

parent 23b3add0

nixos/modules/tasks/filesystems/ext.nix

+2 −1
Original line number Diff line number Diff line
@@ -3,13 +3,14 @@ 
let



  inInitrd = lib.any (fs: fs == "ext2" || fs == "ext3" || fs == "ext4") config.boot.initrd.supportedFilesystems;

  inSystem = lib.any (fs: fs == "ext2" || fs == "ext3" || fs == "ext4") config.boot.supportedFilesystems;



in



{

  config = {



    system.fsPackages = lib.mkIf (config.boot.initrd.systemd.enable -> inInitrd) [ pkgs.e2fsprogs ];

    system.fsPackages = lib.mkIf (config.boot.initrd.systemd.enable -> (inInitrd || inSystem)) [ pkgs.e2fsprogs ];



    # As of kernel 4.3, there is no separate ext3 driver (they're also handled by ext4.ko)

    boot.initrd.availableKernelModules = lib.mkIf (config.boot.initrd.systemd.enable -> inInitrd) [ "ext2" "ext4" ];