Merge master into staging-next

2025-10-01 12:07:23 +00:00
parent 100015447b 382d9ca48e
commit 099c1ef350
61 changed files with 811 additions and 991 deletions
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -1417,7 +1417,7 @@ in
  systemd = runTest ./systemd.nix;
  systemd-analyze = runTest ./systemd-analyze.nix;
  systemd-binfmt = handleTestOn [ "x86_64-linux" ] ./systemd-binfmt.nix { };
-  systemd-boot = handleTest ./systemd-boot.nix { };
+  systemd-boot = import ./systemd-boot.nix { inherit runTest runTestOn; };
  systemd-bpf = runTest ./systemd-bpf.nix;
  systemd-capsules = runTest ./systemd-capsules.nix;
  systemd-confinement = handleTest ./systemd-confinement { };
--- a/nixos/tests/systemd-boot.nix
+++ b/nixos/tests/systemd-boot.nix