Unverified Commit 6958acea authored by nikstur's avatar nikstur Committed by GitHub
Browse files

Merge pull request #262179 from ElvishJerricco/systemd-stage-1-specific-fs-packages 

systemd-stage-1: Use specific fs packages
parents d8e7df7b 18013cc7

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

+1 −1
Original line number Diff line number Diff line
@@ -358,7 +358,7 @@ in { 
    ++ lib.optional (cfg.enableTpm2 && !(pkgs.stdenv.hostPlatform.isRiscV64 || pkgs.stdenv.hostPlatform.isArmv7)) "tpm-crb";



    boot.initrd.systemd = {

      initrdBin = [pkgs.bash pkgs.coreutils cfg.package.kmod cfg.package] ++ config.system.fsPackages;

      initrdBin = [pkgs.bash pkgs.coreutils cfg.package.kmod cfg.package];

      extraBin = {

        less = "${pkgs.less}/bin/less";

        mount = "${cfg.package.util-linux}/bin/mount";

nixos/modules/tasks/filesystems/btrfs.nix

+10 −7
Original line number Diff line number Diff line
@@ -52,34 +52,37 @@ in 
  config = mkMerge [

    (mkIf enableBtrfs {

      system.fsPackages = [ pkgs.btrfs-progs ];

    })



      boot.initrd.kernelModules = mkIf inInitrd [ "btrfs" ];

      boot.initrd.availableKernelModules = mkIf inInitrd (

    (mkIf inInitrd {

      boot.initrd.kernelModules = [ "btrfs" ];

      boot.initrd.availableKernelModules =

        [ "crc32c" ]

        ++ optionals (config.boot.kernelPackages.kernel.kernelAtLeast "5.5") [

          # Needed for mounting filesystems with new checksums

          "xxhash_generic"

          "blake2b_generic"

          "sha256_generic" # Should be baked into our kernel, just to be sure

        ]

      );

        ];



      boot.initrd.extraUtilsCommands = mkIf (inInitrd && !config.boot.initrd.systemd.enable)

      boot.initrd.extraUtilsCommands = mkIf (!config.boot.initrd.systemd.enable)

      ''

        copy_bin_and_libs ${pkgs.btrfs-progs}/bin/btrfs

        ln -sv btrfs $out/bin/btrfsck

        ln -sv btrfsck $out/bin/fsck.btrfs

      '';



      boot.initrd.extraUtilsCommandsTest = mkIf (inInitrd && !config.boot.initrd.systemd.enable)

      boot.initrd.extraUtilsCommandsTest = mkIf (!config.boot.initrd.systemd.enable)

      ''

        $out/bin/btrfs --version

      '';



      boot.initrd.postDeviceCommands = mkIf (inInitrd && !config.boot.initrd.systemd.enable)

      boot.initrd.postDeviceCommands = mkIf (!config.boot.initrd.systemd.enable)

      ''

        btrfs device scan

      '';



      boot.initrd.systemd.initrdBin = [ pkgs.btrfs-progs ];

    })



    (mkIf enableAutoScrub {

nixos/modules/tasks/filesystems/cifs.nix

+2 −0
Original line number Diff line number Diff line
@@ -21,5 +21,7 @@ in 
        copy_bin_and_libs ${pkgs.cifs-utils}/sbin/mount.cifs

      '';



    boot.initrd.systemd.extraBin."mount.cifs" = mkIf inInitrd "${pkgs.cifs-utils}/sbin/mount.cifs";



  };

}

nixos/modules/tasks/filesystems/ext.nix

+2 −0
Original line number Diff line number Diff line
@@ -25,5 +25,7 @@ in 
        ln -sv e2fsck $out/bin/fsck.ext4

      '';



    boot.initrd.systemd.initrdBin = lib.mkIf inInitrd [ pkgs.e2fsprogs ];



  };

}

nixos/modules/tasks/filesystems/f2fs.nix

+2 −0
Original line number Diff line number Diff line
@@ -16,5 +16,7 @@ in 
    boot.initrd.extraUtilsCommands = mkIf (inInitrd && !config.boot.initrd.systemd.enable) ''

      copy_bin_and_libs ${pkgs.f2fs-tools}/sbin/fsck.f2fs

    '';



    boot.initrd.systemd.initrdBin = mkIf inInitrd [ pkgs.f2fs-tools ];

  };

}