public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix Upstart compatibility jobs that depend on "stopped udevtrigger"

Browse Source 
It's not enough to say "after udev-settle.service" since
udev-settle.service is not wanted/required anywhere - we need to say
"wants udev-settle.service" as well.

This should fix problems with ALSA and X11 initialisation that people
have been seeing.
This commit is contained in:
Eelco Dolstra 2012-10-02 10:26:55 -04:00
parent 2cf5e3cb66
commit 7932978617
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/system/upstart/upstart.nix
View File

@ -54,7 +54,7 @@ let
''; '';
in { in {
inherit (job) description requires wants before partOf environment path restartIfChanged unitConfig; inherit (job) description wants before partOf environment path restartIfChanged unitConfig;
after = after =
(if job.startOn == "stopped udevtrigger" then [ "systemd-udev-settle.service" ] else (if job.startOn == "stopped udevtrigger" then [ "systemd-udev-settle.service" ] else
@ -66,6 +66,10 @@ let
builtins.trace "Warning: job ‘${job.name}’ has unknown startOn value ‘${job.startOn}’." [] builtins.trace "Warning: job ‘${job.name}’ has unknown startOn value ‘${job.startOn}’." []
) ++ job.after; ) ++ job.after;
requires =
(if job.startOn == "stopped udevtrigger" then [ "systemd-udev-settle.service" ] else []
) ++ job.requires;
wantedBy = wantedBy =
(if job.startOn == "" then [] else (if job.startOn == "" then [] else
if job.startOn == "ip-up" then [ "ip-up.target" ] else if job.startOn == "ip-up" then [ "ip-up.target" ] else