ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-11 15:27:20 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #267093 from ElvishJerricco/testing-backdoor-fix-ordering

Browse Source
This commit is contained in:
Ryan Lahfa 2023-11-13 15:07:48 +01:00 committed by GitHub
commit 8f1753206f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
nixos/modules/testing/test-instrumentation.nix
View File

@ -11,10 +11,6 @@ let
qemu-common = import ../../lib/qemu-common.nix { inherit lib pkgs; };
backdoorService = {
wantedBy = [ "sysinit.target" ];
unitConfig.DefaultDependencies = false;
conflicts = [ "shutdown.target" "initrd-switch-root.target" ];
before = [ "shutdown.target" "initrd-switch-root.target" ];
requires = [ "dev-hvc0.device" "dev-${qemu-common.qemuSerialDevice}.device" ];
after = [ "dev-hvc0.device" "dev-${qemu-common.qemuSerialDevice}.device" ];
script =
@ -80,7 +76,12 @@ in
}
];
systemd.services.backdoor = backdoorService;
systemd.services.backdoor = lib.mkMerge [
backdoorService
{
wantedBy = [ "multi-user.target" ];
}
];
boot.initrd.systemd = lib.mkMerge [
{
@ -104,7 +105,21 @@ in
"/bin/true"
];
services.backdoor = backdoorService;
services.backdoor = lib.mkMerge [
backdoorService
{
# TODO: Both stage 1 and stage 2 should use these same
# settings. But a lot of existing tests rely on
# backdoor.service having default orderings,
# e.g. systemd-boot.update relies on /boot being mounted
# as soon as backdoor starts. But it can be useful for
# backdoor to start even earlier.
wantedBy = [ "sysinit.target" ];
unitConfig.DefaultDependencies = false;
conflicts = [ "shutdown.target" "initrd-switch-root.target" ];
before = [ "shutdown.target" "initrd-switch-root.target" ];
}
];
contents."/usr/bin/env".source = "${pkgs.coreutils}/bin/env";
})