diff options
| author | William A. Kennington III <william@wkennington.com> | 2014-09-26 00:43:12 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2014-09-26 00:45:38 -0700 |
| commit | d084245e74242227528ca59b2af2e0b50623c311 (patch) | |
| tree | a799ecf207e5918fb9a4f706667f009f5b6753a2 /nixos | |
| parent | 691c8393ea4104de55baf0c7fc425a6abc83357f (diff) | |
| download | nixpkgs-d084245e74242227528ca59b2af2e0b50623c311.tar nixpkgs-d084245e74242227528ca59b2af2e0b50623c311.tar.gz nixpkgs-d084245e74242227528ca59b2af2e0b50623c311.tar.bz2 nixpkgs-d084245e74242227528ca59b2af2e0b50623c311.tar.lz nixpkgs-d084245e74242227528ca59b2af2e0b50623c311.tar.xz nixpkgs-d084245e74242227528ca59b2af2e0b50623c311.tar.zst nixpkgs-d084245e74242227528ca59b2af2e0b50623c311.zip | |
iproute: Fix regressions introduced in 3.16.0
3.16.0 introduced a regression where vlan and veth devices could not be created due to a check in the code for existing devices. This applies the upstream patch which fixes the issue. Additionally, this corrects the nixos network-interfaces task which now needs to specify the name parameter when adding links.
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/tasks/network-interfaces.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix index 97b37b0714c..a2423a2bd30 100644 --- a/nixos/modules/tasks/network-interfaces.nix +++ b/nixos/modules/tasks/network-interfaces.nix @@ -760,7 +760,7 @@ in # Remove Dead Interfaces ip link show "${n}" >/dev/null 2>&1 && ip link delete "${n}" - ip link add "${n}" type bond + ip link add name "${n}" type bond # !!! There must be a better way to wait for the interface while [ ! -d /sys/class/net/${n} ]; do sleep 0.1; done; @@ -798,7 +798,7 @@ in script = '' # Remove Dead Interfaces ip link show "${n}" >/dev/null 2>&1 && ip link delete "${n}" - ip link add "${n}" type sit \ + ip link add name "${n}" type sit \ ${optionalString (v.remote != null) "remote \"${v.remote}\""} \ ${optionalString (v.local != null) "local \"${v.local}\""} \ ${optionalString (v.ttl != null) "ttl ${toString v.ttl}"} \ @@ -824,7 +824,7 @@ in script = '' # Remove Dead Interfaces ip link show "${n}" >/dev/null 2>&1 && ip link delete "${n}" - ip link add link "${v.interface}" "${n}" type vlan id "${toString v.id}" + ip link add link "${v.interface}" name "${n}" type vlan id "${toString v.id}" ip link set "${n}" up ''; postStop = '' |