From 071b192c9d48984c78aec75c05251eeeaa5e2d1e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 14 Sep 2010 11:58:06 +0000
Subject: [PATCH] * Start dhclient after xend.

svn path=/nixos/trunk/; revision=23782
---
 modules/virtualisation/xen.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/modules/virtualisation/xen.nix b/modules/virtualisation/xen.nix
index b4e6a07e6ed..095ce6b78df 100644
--- a/modules/virtualisation/xen.nix
+++ b/modules/virtualisation/xen.nix
@@ -97,6 +97,11 @@ let cfg = config.virtualisation.xen; in
         postStop = "${pkgs.xen}/sbin/xend stop";
       };
 
+    # To prevent a race between dhclient and xend's bridge setup
+    # script (which renames eth* to peth* and recreates eth* as a
+    # virtual device), start dhclient after xend.
+    jobs.dhclient.startOn = mkOverride 50 "started xend";
+
   };
 
 }