From 2224d78b33b07686dcea8a192944b3f622109541 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom.stdin@gmail.com>
Date: Wed, 24 Nov 2010 22:58:53 +0000
Subject: [PATCH] network-interfaces: MAC address support take 2: now it seems
 to work

svn path=/nixos/trunk/; revision=24847
---
 modules/services/networking/dhclient.nix | 2 +-
 modules/tasks/network-interfaces.nix     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/services/networking/dhclient.nix b/modules/services/networking/dhclient.nix
index bd3f781c19a..454bd361b12 100644
--- a/modules/services/networking/dhclient.nix
+++ b/modules/services/networking/dhclient.nix
@@ -8,7 +8,7 @@ let
 
   # Don't start dhclient on explicitly configured interfaces.
   ignoredInterfaces = 
-    map (i: i.name) (lib.filter (i: i ? ipAddress) config.networking.interfaces);
+    map (i: i.name) (lib.filter (i: i ? ipAddress && i.ipAddress != "" ) config.networking.interfaces);
 
   stateDir = "/var/lib/dhcp"; # Don't use /var/state/dhcp; not FHS-compliant.
 
diff --git a/modules/tasks/network-interfaces.nix b/modules/tasks/network-interfaces.nix
index 0c1180af645..640ef0821fc 100644
--- a/modules/tasks/network-interfaces.nix
+++ b/modules/tasks/network-interfaces.nix
@@ -171,7 +171,7 @@ in
                 ''
                   echo "Configuring interface ${i.name}..."
                   ${ifconfig} "${i.name}" down || true
-                  ${ifconfig} hw ether "${i.name}" "${i.macAddress}" || true
+                  ${ifconfig} "${i.name}" hw ether "${i.macAddress}" || true
                 ''
               else "") cfg.interfaces
             }