movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-14 13:39:15 +03:00
Code Issues Projects Releases Packages Wiki Activity

nixos/network-interfaces: Fix rstp support

Browse source
This commit is contained in:
William A. Kennington III 2015-01-13 16:10:39 -08:00
parent 1ec68e0d13
commit 8e5ef7da54
2 changed files with 36 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

12
nixos/modules/tasks/network-interfaces-scripted.nix
View file

@ -37,8 +37,6 @@ let
ip link del "${i}" 2>/dev/null || true
'';
needsMstpd = any ({ rstp, ... }: rstp) (attrValues cfg.bridges);
in
{
@ -194,7 +192,7 @@ in
before = [ "network-interfaces.target" (subsystemDevice n) ];
serviceConfig.Type = "oneshot";
serviceConfig.RemainAfterExit = true;
path = [ pkgs.iproute ] ++ optional v.rstp pkgs.mstpd;
path = [ pkgs.iproute ];
script = ''
# Remove Dead Interfaces
echo "Removing old bridge ${n}..."
@ -209,11 +207,9 @@ in
ip link set "${i}" up
'')}
# Enable rstp on the interface
# Enable stp on the interface
${optionalString v.rstp ''
echo 1 >/sys/class/net/${n}/bridge/stp_state
mstpctl addbridge "${n}"
mstpctl setforcevers "${n}" rstp
echo 2 >/sys/class/net/${n}/bridge/stp_state
''}
ip link set "${n}" up
@ -353,8 +349,6 @@ in
KERNEL=="tun", TAG+="systemd"
'';
services.mstpd = mkIf needsMstpd { enable = true; };
};
}