mdadm: 4.3 -> 4.4 (#438382)

This commit is contained in:
Philip Taron
2025-10-02 01:47:39 +02:00
committed by GitHub
3 changed files with 18 additions and 9 deletions
+2 -2
View File
@@ -1451,9 +1451,9 @@ in
"cat /proc/partitions >&2",
"udevadm control --stop-exec-queue",
"mdadm --create --force /dev/md0 --metadata 1.2 --level=raid1 "
+ "--raid-devices=2 /dev/vda5 /dev/vda6",
+ "--raid-devices=2 --bitmap=internal /dev/vda5 /dev/vda6",
"mdadm --create --force /dev/md1 --metadata 1.2 --level=raid1 "
+ "--raid-devices=2 /dev/vda7 /dev/vda8",
+ "--raid-devices=2 --bitmap=internal /dev/vda7 /dev/vda8",
"udevadm control --start-exec-queue",
"udevadm settle",
"mkswap -f /dev/md1 -L swap",
+1 -1
View File
@@ -48,7 +48,7 @@
testScript = ''
# Create RAID
machine.succeed("mdadm --create --force /dev/md0 -n 2 --level=raid1 /dev/vdb /dev/vdc --metadata=0.90")
machine.succeed("mdadm --create --force /dev/md0 -n 2 --level=raid1 /dev/vdb /dev/vdc --metadata=0.90 --bitmap=internal")
machine.succeed("mkfs.ext4 -L testraid /dev/md0")
machine.succeed("mkdir -p /mnt && mount /dev/md0 /mnt && echo hello > /mnt/test && umount /mnt")
+15 -6
View File
@@ -8,15 +8,17 @@
system-sendmail,
udev,
udevCheckHook,
gitUpdater,
nixosTests,
}:
stdenv.mkDerivation rec {
pname = "mdadm";
version = "4.3";
version = "4.4";
src = fetchurl {
url = "mirror://kernel/linux/utils/raid/mdadm/mdadm-${version}.tar.xz";
sha256 = "sha256-QWcnrh8QgOpuMJDOo23QdoJvw2kVHjarc2VXupIZb58=";
sha256 = "sha256-m0iPNe0VPfmZJLX+Qe7TgOhRLejxihGGKMrN1oGx1XM=";
};
patches = [
@@ -32,10 +34,6 @@ stdenv.mkDerivation rec {
url = "https://lore.kernel.org/linux-raid/20240220165158.3521874-1-raj.khem@gmail.com/raw";
hash = "sha256-JOZ8n7zi+nq236NPpB4e2gUy8I3l3DbcoLhpeL73f98=";
})
(fetchurl {
url = "https://github.com/md-raid-utilities/mdadm/commit/9dbd11e091f84eb0bf9d717283774816c4c4453d.patch";
hash = "sha256-8GdjP1ceVwejTOFXcHXG8wkIF9/D6hOUGD6btvuqs24=";
})
];
makeFlags = [
@@ -80,6 +78,17 @@ stdenv.mkDerivation rec {
grep -r $out $out/bin && false || true
'';
passthru = {
tests = {
inherit (nixosTests) systemd-initrd-swraid;
installer-swraid = nixosTests.installer.swraid;
};
updateScript = gitUpdater {
url = "https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git";
rev-prefix = "mdadm-";
};
};
meta = with lib; {
description = "Programs for managing RAID arrays under Linux";
homepage = "https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git";