diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-11-18 15:42:05 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-11-18 18:04:16 +0100 |
| commit | f8a034172a42bf1f6b436df2e45677bd972d777f (patch) | |
| tree | dd0c6ed3192972f854668de4825d72048c0f1704 | |
| parent | 08a85c2152192f231dccea4d7a3c26dd894d9812 (diff) | |
| download | nixlib-f8a034172a42bf1f6b436df2e45677bd972d777f.tar nixlib-f8a034172a42bf1f6b436df2e45677bd972d777f.tar.gz nixlib-f8a034172a42bf1f6b436df2e45677bd972d777f.tar.bz2 nixlib-f8a034172a42bf1f6b436df2e45677bd972d777f.tar.lz nixlib-f8a034172a42bf1f6b436df2e45677bd972d777f.tar.xz nixlib-f8a034172a42bf1f6b436df2e45677bd972d777f.tar.zst nixlib-f8a034172a42bf1f6b436df2e45677bd972d777f.zip | |
Fix broken Conflicts options
| -rw-r--r-- | nixos/modules/system/boot/kernel.nix | 6 | ||||
| -rw-r--r-- | nixos/modules/tasks/kbd.nix | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix index 006909fbd0c8..64d4c33c9655 100644 --- a/nixos/modules/system/boot/kernel.nix +++ b/nixos/modules/system/boot/kernel.nix @@ -230,10 +230,8 @@ in { description = "Load Kernel Modules"; wantedBy = [ "sysinit.target" "multi-user.target" ]; before = [ "sysinit.target" "shutdown.target" ]; - unitConfig = - { DefaultDependencies = "no"; - Conflicts = "shutdown.target"; - }; + conflicts = [ "shutdown.target" ]; + unitConfig.DefaultDependencies = "no"; serviceConfig = { Type = "oneshot"; RemainAfterExit = true; diff --git a/nixos/modules/tasks/kbd.nix b/nixos/modules/tasks/kbd.nix index 9f294a5f93e3..1083fb784fc0 100644 --- a/nixos/modules/tasks/kbd.nix +++ b/nixos/modules/tasks/kbd.nix @@ -55,9 +55,9 @@ in { description = "Setup Virtual Console"; wantedBy = [ "sysinit.target" "multi-user.target" ]; before = [ "sysinit.target" "shutdown.target" ]; + conflicts = [ "shutdown.target" ]; unitConfig = { DefaultDependencies = "no"; - Conflicts = "shutdown.target"; ConditionPathExists = "/dev/tty1"; }; serviceConfig = |