diff options
| author | Gregor Kleen <gkleen@yggdrasil.li> | 2017-05-30 14:51:13 +0200 |
|---|---|---|
| committer | Gregor Kleen <gkleen@yggdrasil.li> | 2017-05-30 14:51:13 +0200 |
| commit | d29e0ca4e162784aa38600872d57cd65cf6e12bf (patch) | |
| tree | 66f3f4e339028a4d384d4ef573429125df08da2a | |
| parent | 3dc72162d5f92e2c6c605682353ba6ce108d38d2 (diff) | |
| download | nixos-d29e0ca4e162784aa38600872d57cd65cf6e12bf.tar nixos-d29e0ca4e162784aa38600872d57cd65cf6e12bf.tar.gz nixos-d29e0ca4e162784aa38600872d57cd65cf6e12bf.tar.bz2 nixos-d29e0ca4e162784aa38600872d57cd65cf6e12bf.tar.xz nixos-d29e0ca4e162784aa38600872d57cd65cf6e12bf.zip | |
Revert "Use terminate-user to _really_ kill uucp"
This reverts commit 3dc72162d5f92e2c6c605682353ba6ce108d38d2.
| -rw-r--r-- | hel.nix | 8 |
1 files changed, 4 insertions, 4 deletions
| @@ -456,15 +456,15 @@ | |||
| 456 | environment.etc."sane.d/dll.conf".text = "xerox_mfp"; | 456 | environment.etc."sane.d/dll.conf".text = "xerox_mfp"; |
| 457 | environment.etc."sane.d/xerox_mfp.conf".text = "tcp printer.asgard.yggdrasil"; | 457 | environment.etc."sane.d/xerox_mfp.conf".text = "tcp printer.asgard.yggdrasil"; |
| 458 | 458 | ||
| 459 | systemd.services."terminate-user@" = { | 459 | systemd.services."kill-user@" = { |
| 460 | serviceConfig = { | 460 | serviceConfig = { |
| 461 | Type = "oneshot"; | 461 | Type = "oneshot"; |
| 462 | ExecStart = "${pkgs.systemd}/bin/loginctl terminate-user %I"; | 462 | ExecStart = "${pkgs.systemd}/bin/loginctl kill-user %I"; |
| 463 | }; | 463 | }; |
| 464 | }; | 464 | }; |
| 465 | systemd.targets."sleep" = { | 465 | systemd.targets."sleep" = { |
| 466 | after = [ "terminate-user@uucp.service" ]; | 466 | after = [ "kill-user@uucp.service" ]; |
| 467 | wants = [ "terminate-user@uucp.service" ]; | 467 | wants = [ "kill-user@uucp.service" ]; |
| 468 | }; | 468 | }; |
| 469 | 469 | ||
| 470 | virtualisation.virtualbox.host = { | 470 | virtualisation.virtualbox.host = { |