mirror/webgui
1
0
Fork 0
mirror of https://github.com/unraid/webgui.git synced 2026-01-06 01:29:54 -06:00
Code Issues Packages Projects Releases Wiki Activity

Make bridge / macvtap selection per physical interface

Browse Source
This commit is contained in:
bergware
2023-08-10 22:08:04 +02:00
parent afe9065663
commit aeda05bed7
5 changed files with 112 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
emhttp/plugins/dynamix.vm.manager/include/libvirt.php
View File

@@ -661,12 +661,7 @@
$netmodel = $nic['model'] ?: 'virtio-net';
$net_res =$this->libvirt_get_net_res($this->conn, $nic['network']);
$bridge = file_exists('/sys/class/net/br0');
if ($bridge) {
exec("brctl show|grep -Po '^(vir)?br[0-9]+(\.[0-9]+)?'", $br);
} else {
exec("ip -br a|grep -Po '^(virbr|vhost)[0-9][^@ ]*'",$br);
}
exec("ip -br a|grep -Po '^((vir)?br|vhost)[0-9]+(\.[0-9]+)?'",$br);
if ($nic["boot"] != NULL) $nicboot = "<boot order='".$nic["boot"]."'/>" ; else $nicboot = "" ;
if ($net_res) {
$netstr .= "<interface type='network'>
@@ -676,7 +671,7 @@
$nicboot
</interface>";
} elseif (in_array($nic['network'], $br)) {
if ($bridge || $nic['network']=='virbr0') {
if (preg_match('/^(vir)?br/',$nic['network'])) {
$netstr .= "<interface type='bridge'>
<mac address='{$nic['mac']}'/>
<source bridge='" . htmlspecialchars($nic['network'], ENT_QUOTES | ENT_XML1) . "'/>