diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-01-16 12:33:18 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-01-16 12:33:18 +0100 |
| commit | ae4e94d9acc510183fab1501bd6e9ed189b31e20 (patch) | |
| tree | 5a6f132cc64c36c4ae11ee27041df5b8e4ae8ed9 /modules/testing/test-instrumentation.nix | |
| parent | 61f1df279ff7af94cb1b6e1888d2651a6f174cc7 (diff) | |
| download | nixpkgs-ae4e94d9acc510183fab1501bd6e9ed189b31e20.tar nixpkgs-ae4e94d9acc510183fab1501bd6e9ed189b31e20.tar.gz nixpkgs-ae4e94d9acc510183fab1501bd6e9ed189b31e20.tar.bz2 nixpkgs-ae4e94d9acc510183fab1501bd6e9ed189b31e20.tar.lz nixpkgs-ae4e94d9acc510183fab1501bd6e9ed189b31e20.tar.xz nixpkgs-ae4e94d9acc510183fab1501bd6e9ed189b31e20.tar.zst nixpkgs-ae4e94d9acc510183fab1501bd6e9ed189b31e20.zip | |
Rename ‘boot.systemd’ to ‘systemd’
Suggested by Mathijs Kwik. ‘boot.systemd’ is a misnomer because systemd affects more than just booting. And it saves some typing.
Diffstat (limited to 'modules/testing/test-instrumentation.nix')
| -rw-r--r-- | modules/testing/test-instrumentation.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/modules/testing/test-instrumentation.nix b/modules/testing/test-instrumentation.nix index 108dcb0ab6d..9c36ac2bbdd 100644 --- a/modules/testing/test-instrumentation.nix +++ b/modules/testing/test-instrumentation.nix @@ -11,7 +11,7 @@ let kernel = config.boot.kernelPackages.kernel; in config = { - boot.systemd.services.backdoor = + systemd.services.backdoor = { wantedBy = [ "multi-user.target" ]; requires = [ "dev-hvc0.device" "dev-ttyS0.device" ]; after = [ "dev-hvc0.device" "dev-ttyS0.device" ]; @@ -34,8 +34,8 @@ let kernel = config.boot.kernelPackages.kernel; in # Prevent agetty from being instantiated on ttyS0, since it # interferes with the backdoor (writes to ttyS0 will randomly fail # with EIO). Likewise for hvc0. - boot.systemd.services."serial-getty@ttyS0".enable = false; - boot.systemd.services."serial-getty@hvc0".enable = false; + systemd.services."serial-getty@ttyS0".enable = false; + systemd.services."serial-getty@hvc0".enable = false; boot.initrd.postDeviceCommands = '' @@ -77,7 +77,7 @@ let kernel = config.boot.kernelPackages.kernel; in networking.defaultGateway = mkOverride 150 ""; networking.nameservers = mkOverride 150 [ ]; - boot.systemd.globalEnvironment.GCOV_PREFIX = "/tmp/xchg/coverage-data"; + systemd.globalEnvironment.GCOV_PREFIX = "/tmp/xchg/coverage-data"; system.requiredKernelConfig = with config.lib.kernelConfig; [ (isYes "SERIAL_8250_CONSOLE") |