diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-04-10 15:55:51 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-04-10 15:55:51 +0200 |
| commit | d2155649af372b87f6373762356303bb450c6a07 (patch) | |
| tree | 0f9503545b88d99d6bc2aeb78ebaa8ed8418785a /nixos/modules/services/networking/dhcpcd.nix | |
| parent | fe7599b2b2c0f327d2a7672d081f64bbdf6ec2f3 (diff) | |
| parent | 6a7a8a144fae43fae51232703bf742c8bcee8d67 (diff) | |
Merge branch 'containers'
Fixes #2105.
Diffstat (limited to 'nixos/modules/services/networking/dhcpcd.nix')
| -rw-r--r-- | nixos/modules/services/networking/dhcpcd.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/nixos/modules/services/networking/dhcpcd.nix b/nixos/modules/services/networking/dhcpcd.nix index 37f607b08151..bf7f5089368b 100644 --- a/nixos/modules/services/networking/dhcpcd.nix +++ b/nixos/modules/services/networking/dhcpcd.nix @@ -34,8 +34,9 @@ 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 c-* and ctmp-* (NixOS + # containers). + denyinterfaces ${toString ignoredInterfaces} peth* vif* tap* tun* virbr* vnet* vboxnet* c-* ctmp-* ${config.networking.dhcpcd.extraConfig} ''; |