diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-03-15 15:30:12 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-03-15 15:30:12 +0000 |
| commit | f71bd3f93ca15efd4e64c93f35eafc5d2cc95943 (patch) | |
| tree | 7fb682ae357604263f1bd4c17602e2b35f58ab0e /modules/services/networking/dhclient.nix | |
| parent | 3cb7a54dbafb93cb7f8f0f0b315676b367172466 (diff) | |
| download | nixlib-f71bd3f93ca15efd4e64c93f35eafc5d2cc95943.tar nixlib-f71bd3f93ca15efd4e64c93f35eafc5d2cc95943.tar.gz nixlib-f71bd3f93ca15efd4e64c93f35eafc5d2cc95943.tar.bz2 nixlib-f71bd3f93ca15efd4e64c93f35eafc5d2cc95943.tar.lz nixlib-f71bd3f93ca15efd4e64c93f35eafc5d2cc95943.tar.xz nixlib-f71bd3f93ca15efd4e64c93f35eafc5d2cc95943.tar.zst nixlib-f71bd3f93ca15efd4e64c93f35eafc5d2cc95943.zip | |
* dhclient: ignore libvirt's network interfaces.
svn path=/nixos/trunk/; revision=26327
Diffstat (limited to 'modules/services/networking/dhclient.nix')
| -rw-r--r-- | modules/services/networking/dhclient.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/modules/services/networking/dhclient.nix b/modules/services/networking/dhclient.nix index dc8b378e8756..2acef81e1e52 100644 --- a/modules/services/networking/dhclient.nix +++ b/modules/services/networking/dhclient.nix @@ -82,10 +82,11 @@ 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. Likewise for vif* and tap*. + # bridging. Likewise for vif* and tap* (Xen) and + # virbr* and vnet* (libvirt). 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.*"; + ! echo "$i" | grep -x -q "peth.*\|vif.*\|tap.*\|virbr.*\|vnet.*"; then echo "Running dhclient on $i" interfaces="$interfaces $i" |