alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Fix broken Conflicts options

Browse source
This commit is contained in:
Eelco Dolstra 2013-11-18 15:42:05 +01:00
parent 08a85c2152
commit f8a034172a
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
nixos/modules/system/boot/kernel.nix
View file

@ -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;

2
nixos/modules/tasks/kbd.nix
View file

@ -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 =