From 8b841505ff16054f87be6f760d3ce7f1efb9e27b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 26 Apr 2012 12:31:33 +0000
Subject: [PATCH] modules/services/networking/{dhclient,dhcpcd}.nix: ignore
 virtual veth* devices created by LXC/cgroups

svn path=/nixos/trunk/; revision=33928
---
 modules/services/networking/dhclient.nix | 4 ++--
 modules/services/networking/dhcpcd.nix   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/services/networking/dhclient.nix b/modules/services/networking/dhclient.nix
index 1e3434438997..dc663e332894 100644
--- a/modules/services/networking/dhclient.nix
+++ b/modules/services/networking/dhclient.nix
@@ -63,10 +63,10 @@ in
                 # (1), i.e. Ethernet.  Ignore peth* devices; on Xen,
                 # they're renamed physical Ethernet cards used for
                 # bridging.  Likewise for vif* and tap* (Xen) and
-                # virbr* and vnet* (libvirt).
+                # virbr* and vnet* (libvirt) and veth* (cgroup).
                 if [ "$(cat /sys/class/net/$i/type)" = 1 ]; then
                     if ! for j in ${toString ignoredInterfaces}; do echo $j; done | grep -F -x -q "$i" &&
-                       ! echo "$i" | grep -x -q "peth.*\|vif.*\|tap.*\|virbr.*\|vnet.*";
+                       ! echo "$i" | grep -x -q "peth.*\|vif.*\|tap.*\|virbr.*\|vnet.*\|veth.*";
 		    then
                         echo "Running dhclient on $i"
                         interfaces="$interfaces $i"
diff --git a/modules/services/networking/dhcpcd.nix b/modules/services/networking/dhcpcd.nix
index b22bbb3f0517..ddc18374e5c3 100644
--- a/modules/services/networking/dhcpcd.nix
+++ b/modules/services/networking/dhcpcd.nix
@@ -31,8 +31,8 @@ let
 
       # Ignore peth* devices; on Xen, they're renamed physical
       # Ethernet cards used for bridging.  Likewise for vif* and tap*
-      # (Xen) and virbr* and vnet* (libvirt).
-      denyinterfaces ${toString ignoredInterfaces} peth* vif* tap* tun* virbr* vnet* vboxnet*
+      # (Xen) and virbr* and vnet* (libvirt) and veth* (cgroups).
+      denyinterfaces ${toString ignoredInterfaces} peth* vif* tap* tun* virbr* vnet* vboxnet* veth*
     '';
 
   # Hook for emitting ip-up/ip-down events.