mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-28 18:03:04 +00:00
swraid service: use upstream units
This fixes a serious bug on NixOS with swraid where mdadm arrays weren't properly stopped on shutdown. Rather than fixing the unit by adding `Before=final.target` we completely move to upstream units, which uses systemd shutdown hooks instead. This also drives down maintenance costs for us.
This commit is contained in:
parent
b9b27912ce
commit
ca780f4a18
@ -6,51 +6,13 @@
|
|||||||
|
|
||||||
services.udev.packages = [ pkgs.mdadm ];
|
services.udev.packages = [ pkgs.mdadm ];
|
||||||
|
|
||||||
|
systemd.packages = [ pkgs.mdadm ];
|
||||||
|
systemd.shutdownPackages = [ pkgs.mdadm ];
|
||||||
|
|
||||||
boot.initrd.availableKernelModules = [ "md_mod" "raid0" "raid1" "raid10" "raid456" ];
|
boot.initrd.availableKernelModules = [ "md_mod" "raid0" "raid1" "raid10" "raid456" ];
|
||||||
|
|
||||||
boot.initrd.extraUdevRulesCommands = ''
|
boot.initrd.extraUdevRulesCommands = ''
|
||||||
cp -v ${pkgs.mdadm}/lib/udev/rules.d/*.rules $out/
|
cp -v ${pkgs.mdadm}/lib/udev/rules.d/*.rules $out/
|
||||||
'';
|
'';
|
||||||
|
|
||||||
systemd.services.mdadm-shutdown = {
|
|
||||||
wantedBy = [ "final.target"];
|
|
||||||
after = [ "umount.target" ];
|
|
||||||
|
|
||||||
unitConfig = {
|
|
||||||
DefaultDependencies = false;
|
|
||||||
};
|
|
||||||
|
|
||||||
serviceConfig = {
|
|
||||||
Type = "oneshot";
|
|
||||||
ExecStart = ''${pkgs.mdadm}/bin/mdadm --wait-clean --scan'';
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
systemd.services."mdmon@" = {
|
|
||||||
description = "MD Metadata Monitor on /dev/%I";
|
|
||||||
|
|
||||||
unitConfig.DefaultDependencies = false;
|
|
||||||
|
|
||||||
serviceConfig = {
|
|
||||||
Type = "forking";
|
|
||||||
Environment = "IMSM_NO_PLATFORM=1";
|
|
||||||
ExecStart = ''${pkgs.mdadm}/bin/mdmon --offroot --takeover %I'';
|
|
||||||
KillMode = "none";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
systemd.services."mdadm-grow-continue@" = {
|
|
||||||
description = "Manage MD Reshape on /dev/%I";
|
|
||||||
|
|
||||||
unitConfig.DefaultDependencies = false;
|
|
||||||
|
|
||||||
serviceConfig = {
|
|
||||||
ExecStart = ''${pkgs.mdadm}/bin/mdadm --grow --continue /dev/%I'';
|
|
||||||
StandardInput = "null";
|
|
||||||
StandardOutput = "null";
|
|
||||||
StandardError = "null";
|
|
||||||
KillMode = "none";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user