Commit 7d2124f9 authored by Linus Heckemann's avatar Linus Heckemann
Browse files

stage-1: Only copy mdadm and mdmon into initramfs if enabled

parent c0f963a3

nixos/modules/system/boot/stage-1.nix

+0 −5
Original line number Diff line number Diff line
@@ -133,10 +133,6 @@ let 
      copy_bin_and_libs ${getBin pkgs.lvm2}/bin/dmsetup

      copy_bin_and_libs ${getBin pkgs.lvm2}/bin/lvm



      # Add RAID mdadm tool.

      copy_bin_and_libs ${pkgs.mdadm}/sbin/mdadm

      copy_bin_and_libs ${pkgs.mdadm}/sbin/mdmon



      # Copy udev.

      copy_bin_and_libs ${udev}/bin/udevadm

      copy_bin_and_libs ${udev}/lib/systemd/systemd-sysctl
@@ -225,7 +221,6 @@ let 
      $out/bin/udevadm --version

      $out/bin/dmsetup --version 2>&1 | tee -a log | grep -q "version:"

      LVM_SYSTEM_DIR=$out $out/bin/lvm version 2>&1 | tee -a log | grep -q "LVM"

      $out/bin/mdadm --version

      ${optionalString config.services.multipath.enable ''

        ($out/bin/multipath || true) 2>&1 | grep -q 'need to be root'

        ($out/bin/multipathd || true) 2>&1 | grep -q 'need to be root'

nixos/modules/tasks/swraid.nix

+10 −0
Original line number Diff line number Diff line
@@ -44,6 +44,16 @@ in { 
        cp -v ${pkgs.mdadm}/lib/udev/rules.d/*.rules $out/

      '';



      extraUtilsCommands = ''

        # Add RAID mdadm tool.

        copy_bin_and_libs ${pkgs.mdadm}/sbin/mdadm

        copy_bin_and_libs ${pkgs.mdadm}/sbin/mdmon

      '';



      extraUtilsCommandsTest = ''

        $out/bin/mdadm --version

      '';



      extraFiles."/etc/mdadm.conf".source = pkgs.writeText "mdadm.conf" config.boot.swraid.mdadmConf;



      systemd = {