From 10cbb52ae7b79ca6e9d25abf9d8b103847924d76 Mon Sep 17 00:00:00 2001
From: Volth <volth@webmaster.ms>
Date: Thu, 27 Jul 2017 05:49:18 +0000
Subject: [PATCH] nixos/networking-scripted: restore bridge slaves dynamically
 added by libvirt

---
 nixos/modules/tasks/network-interfaces-scripted.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/nixos/modules/tasks/network-interfaces-scripted.nix b/nixos/modules/tasks/network-interfaces-scripted.nix
index f6f104ce7a68..8328eed076ec 100644
--- a/nixos/modules/tasks/network-interfaces-scripted.nix
+++ b/nixos/modules/tasks/network-interfaces-scripted.nix
@@ -251,6 +251,13 @@ let
                 ${i}
               '')}" > /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
               ${optionalString v.rstp ''
                 echo 2 >/sys/class/net/${n}/bridge/stp_state