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=