diff options
author | William A. Kennington III <william@wkennington.com> | 2014-07-04 15:01:26 -0500 |
---|---|---|
committer | William A. Kennington III <william@wkennington.com> | 2014-08-14 14:06:56 -0500 |
commit | bc6979f7e1a3a2fe65d813cc18ee5a37ed0e4d4d (patch) | |
tree | d9bc788c4fc8f9d6b4290fa55cbc84d0570e8665 /nixos/modules/services/networking/dhcpcd.nix | |
parent | 40d88e9f80075567f4c36e371a3dd36568108b02 (diff) | |
download | nixlib-bc6979f7e1a3a2fe65d813cc18ee5a37ed0e4d4d.tar nixlib-bc6979f7e1a3a2fe65d813cc18ee5a37ed0e4d4d.tar.gz nixlib-bc6979f7e1a3a2fe65d813cc18ee5a37ed0e4d4d.tar.bz2 nixlib-bc6979f7e1a3a2fe65d813cc18ee5a37ed0e4d4d.tar.lz nixlib-bc6979f7e1a3a2fe65d813cc18ee5a37ed0e4d4d.tar.xz nixlib-bc6979f7e1a3a2fe65d813cc18ee5a37ed0e4d4d.tar.zst nixlib-bc6979f7e1a3a2fe65d813cc18ee5a37ed0e4d4d.zip |
nixos/dhcpcd: Don't configure sit devices
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 5a353fc0942a..866707c3a913 100644 --- a/nixos/modules/services/networking/dhcpcd.nix +++ b/nixos/modules/services/networking/dhcpcd.nix @@ -7,9 +7,10 @@ let dhcpcd = if !config.boot.isContainer then pkgs.dhcpcd else pkgs.dhcpcd.override { udev = null; }; # Don't start dhcpcd on explicitly configured interfaces or on - # interfaces that are part of a bridge. + # interfaces that are part of a bridge, bond or sit device. ignoredInterfaces = map (i: i.name) (filter (i: i.ipAddress != null) (attrValues config.networking.interfaces)) + ++ mapAttrsToList (i: _: i) config.networking.sits ++ concatLists (attrValues (mapAttrs (n: v: v.interfaces) config.networking.bridges)) ++ concatLists (attrValues (mapAttrs (n: v: v.interfaces) config.networking.bonds)) ++ config.networking.dhcpcd.denyInterfaces; @@ -35,7 +36,7 @@ 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} lo peth* vif* tap* tun* virbr* vnet* vboxnet* + denyinterfaces ${toString ignoredInterfaces} lo peth* vif* tap* tun* virbr* vnet* vboxnet* sit* ${config.networking.dhcpcd.extraConfig} ''; |