From 673bf12b1d4132d815e95c98ad27946ad7486bd3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 18 Jun 2012 00:22:18 -0400
Subject: [PATCH] Improve the dependencies of units generated by the Upstart
 emulation

---
 modules/system/upstart/upstart.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/system/upstart/upstart.nix b/modules/system/upstart/upstart.nix
index 2e57ac358da6..0f7eb65bf2ff 100644
--- a/modules/system/upstart/upstart.nix
+++ b/modules/system/upstart/upstart.nix
@@ -57,6 +57,9 @@ let
         ''
           [Unit]
           Description=${job.description}
+          ${if job.startOn == "stopped udevtrigger" then "After=systemd-udev-settle.service" else
+            if job.startOn == "started udev" then "After=systemd-udev.service"
+            else ""}
 
           [Service]
           Environment=PATH=${job.path}
@@ -94,10 +97,7 @@ let
           ${optionalString (!job.task && job.respawn) "Restart=always"}
         '';
 
-      wantedBy =
-        if job.startOn == "" then [ ]
-        else if job.startOn == "startup" then [ "basic.target" ]
-        else [ "multi-user.target" ];
+      wantedBy = if job.startOn == "" then [ ] else [ "multi-user.target" ];
 
     };