commit 8f1753206f37f1d6246ad5c61ce32da43cc9f5c0 · pyrox.dev/nixpkgs

+21 -6
nixos/modules/testing/test-instrumentation.nix
···

       11
       11
        
         qemu-common = import ../../lib/qemu-common.nix { inherit lib pkgs; };

     

       12
       12
        
       

     

       13
       13
        
         backdoorService = {

     

       14
       14
       -
           wantedBy = [ "sysinit.target" ];

     

       15
       15
       -
           unitConfig.DefaultDependencies = false;

     

       16
       16
       -
           conflicts = [ "shutdown.target" "initrd-switch-root.target" ];

     

       17
       17
       -
           before = [ "shutdown.target" "initrd-switch-root.target" ];

     

       18
       14
        
           requires = [ "dev-hvc0.device" "dev-${qemu-common.qemuSerialDevice}.device" ];

     

       19
       15
        
           after = [ "dev-hvc0.device" "dev-${qemu-common.qemuSerialDevice}.device" ];

     

       20
       16
        
           script =

     
···

       80
       76
        
             }

     

       81
       77
        
           ];

     

       82
       78
        
       

     

       83
       83
       -
           systemd.services.backdoor = backdoorService;

     

       79
       79
       +
           systemd.services.backdoor = lib.mkMerge [

     

       80
       80
       +
             backdoorService

     

       81
       81
       +
             {

     

       82
       82
       +
               wantedBy = [ "multi-user.target" ];

     

       83
       83
       +
             }

     

       84
       84
       +
           ];

     

       84
       85
        
       

     

       85
       86
        
           boot.initrd.systemd = lib.mkMerge [

     

       86
       87
        
             {

     
···

       104
       105
        
                 "/bin/true"

     

       105
       106
        
               ];

     

       106
       107
        
       

     

       107
       107
       -
               services.backdoor = backdoorService;

     

       108
       108
       +
               services.backdoor = lib.mkMerge [

     

       109
       109
       +
                 backdoorService

     

       110
       110
       +
                 {

     

       111
       111
       +
                   # TODO: Both stage 1 and stage 2 should use these same

     

       112
       112
       +
                   # settings. But a lot of existing tests rely on

     

       113
       113
       +
                   # backdoor.service having default orderings,

     

       114
       114
       +
                   # e.g. systemd-boot.update relies on /boot being mounted

     

       115
       115
       +
                   # as soon as backdoor starts. But it can be useful for

     

       116
       116
       +
                   # backdoor to start even earlier.

     

       117
       117
       +
                   wantedBy = [ "sysinit.target" ];

     

       118
       118
       +
                   unitConfig.DefaultDependencies = false;

     

       119
       119
       +
                   conflicts = [ "shutdown.target" "initrd-switch-root.target" ];

     

       120
       120
       +
                   before = [ "shutdown.target" "initrd-switch-root.target" ];

     

       121
       121
       +
                 }

     

       122
       122
       +
               ];

     

       108
       123
        
       

     

       109
       124
        
               contents."/usr/bin/env".source = "${pkgs.coreutils}/bin/env";

     

       110
       125
        
             })