From f99d235cb3567241c22c064201b1b910acd62006 Mon Sep 17 00:00:00 2001 From: nikstur Date: Tue, 23 Jun 2026 14:23:33 +0200 Subject: [PATCH] nixos/tests/systemd-repart: fix factory-reset test for systemd 261 In 261, this will break, adding an additional ordering will make the test more likely to succeed. However, it is still fundamentally flakey and ultimately kind of broken upstream. --- nixos/tests/systemd-repart.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/nixos/tests/systemd-repart.nix b/nixos/tests/systemd-repart.nix index a991709a5c66..ebc487a8c1bc 100644 --- a/nixos/tests/systemd-repart.nix +++ b/nixos/tests/systemd-repart.nix @@ -303,10 +303,14 @@ in systemd = { enable = true; # avoids reaching cryptsetup.target before recreation of the - # "state" volume completed, during the factory reset + # "state" volume completed, during the factory reset and tries to + # ensure that devices are retriggered before trying to work with them. services.systemd-repart.before = [ "systemd-cryptsetup@state.service" ]; + services.systemd-factory-reset-complete.before = [ + "systemd-cryptsetup@state.service" + ]; repart = { enable = true; extraArgs = [