Unverified Commit 150f8362 authored by Florian Klink's avatar Florian Klink Committed by GitHub
Browse files

Merge pull request #275340 from flokli/initrd-makefs-unconditionally 

nixos/systemd/initrd: add systemd-makefs unconditionally
parents 18e9441d 5a57cde1

nixos/modules/system/boot/systemd/initrd.nix

+1 −3
Original line number Diff line number Diff line
@@ -90,8 +90,6 @@ let 


  fileSystems = filter utils.fsNeededForBoot config.system.build.fileSystems;



  needMakefs = lib.any (fs: fs.autoFormat) fileSystems;



  kernel-name = config.boot.kernelPackages.kernel.name or "kernel";

  modulesTree = config.system.modulesTree.override { name = kernel-name + "-modules"; };

  firmware = config.hardware.firmware;
@@ -430,7 +428,7 @@ in { 
        "${cfg.package}/lib/systemd/systemd-fsck"

        "${cfg.package}/lib/systemd/systemd-hibernate-resume"

        "${cfg.package}/lib/systemd/systemd-journald"

        (lib.mkIf needMakefs "${cfg.package}/lib/systemd/systemd-makefs")

        "${cfg.package}/lib/systemd/systemd-makefs"

        "${cfg.package}/lib/systemd/systemd-modules-load"

        "${cfg.package}/lib/systemd/systemd-remount-fs"

        "${cfg.package}/lib/systemd/systemd-shutdown"