public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki 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"; { description = "Load Kernel Modules";
wantedBy = [ "sysinit.target" "multi-user.target" ]; wantedBy = [ "sysinit.target" "multi-user.target" ];
before = [ "sysinit.target" "shutdown.target" ]; before = [ "sysinit.target" "shutdown.target" ];
unitConfig = conflicts = [ "shutdown.target" ];
{ DefaultDependencies = "no"; unitConfig.DefaultDependencies = "no";
Conflicts = "shutdown.target";
};
serviceConfig = serviceConfig =
{ Type = "oneshot"; { Type = "oneshot";
RemainAfterExit = true; RemainAfterExit = true;

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

@ -55,9 +55,9 @@ in
{ description = "Setup Virtual Console"; { description = "Setup Virtual Console";
wantedBy = [ "sysinit.target" "multi-user.target" ]; wantedBy = [ "sysinit.target" "multi-user.target" ];
before = [ "sysinit.target" "shutdown.target" ]; before = [ "sysinit.target" "shutdown.target" ];
conflicts = [ "shutdown.target" ];
unitConfig = unitConfig =
{ DefaultDependencies = "no"; { DefaultDependencies = "no";
Conflicts = "shutdown.target";
ConditionPathExists = "/dev/tty1"; ConditionPathExists = "/dev/tty1";
}; };
serviceConfig = serviceConfig =