diff options
| author | rnhmjoj <rnhmjoj@inventati.org> | 2023-05-27 15:09:22 +0200 |
|---|---|---|
| committer | rnhmjoj <rnhmjoj@inventati.org> | 2023-05-27 15:09:22 +0200 |
| commit | 6732106210fe87ecb497b86dfa7a451ead65cdb4 (patch) | |
| tree | f9b01cd559017e07f1ad6038a6fa2bec2cb40fdd /nixos/modules/tasks | |
| parent | c3e70a4225e3cf8b528bd11d30c3cfe8e742ce45 (diff) | |
| download | nixpkgs-6732106210fe87ecb497b86dfa7a451ead65cdb4.tar nixpkgs-6732106210fe87ecb497b86dfa7a451ead65cdb4.tar.gz nixpkgs-6732106210fe87ecb497b86dfa7a451ead65cdb4.tar.bz2 nixpkgs-6732106210fe87ecb497b86dfa7a451ead65cdb4.tar.lz nixpkgs-6732106210fe87ecb497b86dfa7a451ead65cdb4.tar.xz nixpkgs-6732106210fe87ecb497b86dfa7a451ead65cdb4.tar.zst nixpkgs-6732106210fe87ecb497b86dfa7a451ead65cdb4.zip | |
network-interfaces-scripted: fix interface cleanup
There is apparently a bug in the parser of iproute2 where the command `ip link show <devname>` will not show the device but list all interfaces (equivalent to `ip link show`) if devname is equal to one of the flags of `ip-address(8)`. For example, `home`, or `optimistic`. This bug causes a false positive in the clean up command of the <devname>-netdev.service, the service fails and the interface is never configured. To avoid the bug we can simply use `ip link show dev <devname>`.
Diffstat (limited to 'nixos/modules/tasks')
| -rw-r--r-- | nixos/modules/tasks/network-interfaces-scripted.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/nixos/modules/tasks/network-interfaces-scripted.nix b/nixos/modules/tasks/network-interfaces-scripted.nix index 843082ab858..24f0c37acf9 100644 --- a/nixos/modules/tasks/network-interfaces-scripted.nix +++ b/nixos/modules/tasks/network-interfaces-scripted.nix @@ -293,7 +293,7 @@ let script = '' # Remove Dead Interfaces echo "Removing old bridge ${n}..." - ip link show "${n}" >/dev/null 2>&1 && ip link del "${n}" + ip link show dev "${n}" >/dev/null 2>&1 && ip link del "${n}" echo "Adding bridge ${n}..." ip link add name "${n}" type bridge @@ -459,7 +459,7 @@ let path = [ pkgs.iproute2 ]; script = '' # Remove Dead Interfaces - ip link show "${n}" >/dev/null 2>&1 && ip link delete "${n}" + ip link show dev "${n}" >/dev/null 2>&1 && ip link delete "${n}" ip link add link "${v.interface}" name "${n}" type macvlan \ ${optionalString (v.mode != null) "mode ${v.mode}"} ip link set "${n}" up @@ -517,7 +517,7 @@ let path = [ pkgs.iproute2 ]; script = '' # Remove Dead Interfaces - ip link show "${n}" >/dev/null 2>&1 && ip link delete "${n}" + ip link show dev "${n}" >/dev/null 2>&1 && ip link delete "${n}" ip link add name "${n}" type sit \ ${optionalString (v.remote != null) "remote \"${v.remote}\""} \ ${optionalString (v.local != null) "local \"${v.local}\""} \ @@ -551,7 +551,7 @@ let path = [ pkgs.iproute2 ]; script = '' # Remove Dead Interfaces - ip link show "${n}" >/dev/null 2>&1 && ip link delete "${n}" + ip link show dev "${n}" >/dev/null 2>&1 && ip link delete "${n}" ip link add name "${n}" type ${v.type} \ ${optionalString (v.remote != null) "remote \"${v.remote}\""} \ ${optionalString (v.local != null) "local \"${v.local}\""} \ @@ -579,7 +579,7 @@ let path = [ pkgs.iproute2 ]; script = '' # Remove Dead Interfaces - ip link show "${n}" >/dev/null 2>&1 && ip link delete "${n}" + ip link show dev "${n}" >/dev/null 2>&1 && ip link delete "${n}" ip link add link "${v.interface}" name "${n}" type vlan id "${toString v.id}" # We try to bring up the logical VLAN interface. If the master |