From 29813b418c03964581ab2837b68a402f453120de Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 1 Dec 2010 16:14:44 +0000
Subject: [PATCH] * Don't run dhclient on Xen's vif* and tap* interfaces.

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

diff --git a/modules/services/networking/dhclient.nix b/modules/services/networking/dhclient.nix
index 454bd361b12..7d45350fe6b 100644
--- a/modules/services/networking/dhclient.nix
+++ b/modules/services/networking/dhclient.nix
@@ -80,10 +80,10 @@ in
                 # Only run dhclient on interfaces of type ARPHRD_ETHER
                 # (1), i.e. Ethernet.  Ignore peth* devices; on Xen,
                 # they're renamed physical Ethernet cards used for
-                # bridging.
+                # bridging.  Likewise for vif* and tap*.
                 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.*";
+                       ! echo "$i" | grep -x -q "peth.*\|vif.*\|tap.*";
 		    then
                         echo "Running dhclient on $i"
                         interfaces="$interfaces $i"