Author: egorochkin
Date: Wed Nov 24 22:58:53 2010
New Revision: 24847
URL: https://svn.nixos.org/websvn/nix/?rev=24847&sc=1
Log:
network-interfaces: MAC address support take 2: now it seems to work
Modified:
nixos/trunk/modules/services/networking/dhclient.nix
nixos/trunk/modules/tasks/network-interfaces.nix
Modified: nixos/trunk/modules/services/networking/dhclient.nix
==============================================================================
--- nixos/trunk/modules/services/networking/dhclient.nix Wed Nov 24
22:58:48 2010 (r24846)
+++ nixos/trunk/modules/services/networking/dhclient.nix Wed Nov 24
22:58:53 2010 (r24847)
@@ -8,7 +8,7 @@
# 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.
Modified: nixos/trunk/modules/tasks/network-interfaces.nix
==============================================================================
--- nixos/trunk/modules/tasks/network-interfaces.nix Wed Nov 24 22:58:48
2010 (r24846)
+++ nixos/trunk/modules/tasks/network-interfaces.nix Wed Nov 24 22:58:53
2010 (r24847)
@@ -171,7 +171,7 @@
''
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
}
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
