From 619c3e0465cad9fe1600344300e3b5ced4f6b6c9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 20 Feb 2007 14:20:33 +0000
Subject: [PATCH] * Don't use the DHCP wrapper.

svn path=/nixos/trunk/; revision=7921
---
 system/upstart.nix        | 3 +--
 upstart-jobs/dhclient.nix | 2 ++
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/system/upstart.nix b/system/upstart.nix
index 4e81e10f930..71affda04ac 100644
--- a/system/upstart.nix
+++ b/system/upstart.nix
@@ -93,8 +93,7 @@ import ../upstart-jobs/gather.nix {
   # DHCP client.
   ++ optional ["networking" "useDHCP"]
     (import ../upstart-jobs/dhclient.nix {
-      inherit (pkgs) nettools;
-      dhcp = pkgs.dhcpWrapper;
+      inherit (pkgs) nettools dhcp;
     })
 
   # SSH daemon.
diff --git a/upstart-jobs/dhclient.nix b/upstart-jobs/dhclient.nix
index 3b8161820d8..f4d4ab17cc6 100644
--- a/upstart-jobs/dhclient.nix
+++ b/upstart-jobs/dhclient.nix
@@ -9,6 +9,8 @@ description \"DHCP client\"
 start on network-interfaces/started
 stop on network-interfaces/stop
 
+env PATH_DHCLIENT_SCRIPT=${dhcp}/sbin/dhclient-script
+
 script
     # Determine the interface on which to start dhclient.
     interfaces=