From 6ae0b3beed250f014d0d499d04ab59fa2ea3eb76 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 2 Nov 2012 14:20:05 +0100
Subject: [PATCH] dhcpcd: Don't use --background so that fetch-ec2-data can be
 ordered after it

---
 modules/services/networking/dhcpcd.nix | 2 +-
 modules/virtualisation/ec2-data.nix    | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/services/networking/dhcpcd.nix b/modules/services/networking/dhcpcd.nix
index f9d588ea5483..3abd77c8eeb0 100644
--- a/modules/services/networking/dhcpcd.nix
+++ b/modules/services/networking/dhcpcd.nix
@@ -101,7 +101,7 @@ in
         serviceConfig =
           { Type = "forking";
             PIDFile = "/run/dhcpcd.pid";
-            ExecStart = "@${dhcpcd}/sbin/dhcpcd dhcpcd --config ${dhcpcdConf} --background";
+            ExecStart = "@${dhcpcd}/sbin/dhcpcd dhcpcd --config ${dhcpcdConf}";
             ExecReload = "${dhcpcd}/sbin/dhcpcd --rebind";
             StandardError = "null";
           };
diff --git a/modules/virtualisation/ec2-data.nix b/modules/virtualisation/ec2-data.nix
index 2f58a9694921..3f005d6eb2d5 100644
--- a/modules/virtualisation/ec2-data.nix
+++ b/modules/virtualisation/ec2-data.nix
@@ -13,6 +13,7 @@ with pkgs.lib;
 
       wantedBy = [ "multi-user.target" ];
       before = [ "sshd.service" ];
+      after = [ "dhcpcd.service" ];
 
       path = [ pkgs.curl pkgs.iproute ];