JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nixos/networking-scripted: restore bridge slaves dynamically added by libvirt

Browse Source
This commit is contained in:
Volth 2017-07-27 05:49:18 +00:00
parent 07e7527fdb
commit 10cbb52ae7
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nixos/modules/tasks/network-interfaces-scripted.nix
View File

@ -251,6 +251,13 @@ let
${i} ${i}
'')}" > /run/${n}.interfaces '')}" > /run/${n}.interfaces
${optionalString config.virtualisation.libvirtd.enable ''
# Enslave dynamically added interfaces which may be lost on nixos-rebuild
for dom in $(${pkgs.libvirt}/bin/virsh list --name); do
${pkgs.libvirt}/bin/virsh dumpxml "$dom" | ${pkgs.xmlstarlet}/bin/xmlstarlet sel -t -m "//domain/devices/interface[@type='bridge']" -v "concat('ip link set ',target/@dev,' master ',source/@bridge)" | ${pkgs.bash}/bin/bash
done
''}
# Enable stp on the interface # Enable stp on the interface
${optionalString v.rstp '' ${optionalString v.rstp ''
echo 2 >/sys/class/net/${n}/bridge/stp_state echo 2 >/sys/class/net/${n}/bridge/stp_state