mirror/webgui
1
0
Fork 0
mirror of https://github.com/unraid/webgui.git synced 2026-05-18 12:20:25 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1071 from bergware/master

Browse Source 
BTRFS balance: fix recommendation message when volume is empty
This commit is contained in:
tom mortensen
2022-04-16 08:18:37 -07:00
committed by GitHub
parent 5742ef3143 838becf80c
commit 02ea10c311
2 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/dynamix/DeviceInfo.page
+1 -1
View File
@@ -517,7 +517,7 @@ _(btrfs balance status)_:
<input type="hidden" name="#arg[3]" value="">
&nbsp;
: &nbsp;_(Current usage ratio)_: <?=round($usage,1)?> % --- <?=($usage <= 50) ? "_(Full Balance recommended)_" : "_(No Balance required)_"?>
: &nbsp;_(Current usage ratio)_: <?=round($usage,1)?> % --- <?=($usage > 0 && $usage <= 50) ? "_(Full Balance recommended)_" : "_(No Balance required)_"?>
&nbsp;
: <input type="submit" value="_(Balance)_">
plugins/dynamix/include/update.wireguard.php
+18 -3
View File
@@ -91,15 +91,29 @@ function addDocker($vtun) {
$network = "$dockernet.$index.0/24";
exec("docker network create $vtun --subnet=$network 2>/dev/null");
$error = dockerNet($vtun);
if (!$error && !exec("ip rule|grep -Pom1 'from $network'")) {
extract(parse_ini_file('state/network.ini',true));
$thisnet = long2ip(ip2long($eth0['IPADDR:0']) & ip2long($eth0['NETMASK:0'])).'/'.mask2cidr($eth0['NETMASK:0']);
$gateway = $eth0['GATEWAY:0'];
exec("ip -4 rule add from $network table $index");
exec("ip -4 route add unreachable default table $index");
exec("ip -4 route add $thisnet via $gateway table $index");
}
}
return $error;
}
function delDocker($vtun) {
global $dockerd;
global $dockerd,$dockernet;
$error = false;
if ($dockerd && !dockerNet($vtun)) {
$index = substr($vtun,2)+200;
$network = "$dockernet.$index.0/24";
exec("docker network rm $vtun 2>/dev/null");
$error = !dockerNet($vtun);
if (!$error && exec("ip rule|grep -Pom1 'from $network'")) {
exec("ip -4 route flush table $index");
exec("ip -4 rule del from $network table $index");
}
}
return $error;
}
@@ -203,11 +217,12 @@ function parseInput($vtun,&$input,&$x) {
$network = "$dockernet.$index.0/24";
$thisnet = long2ip(ip2long($eth0['IPADDR:0']) & ip2long($eth0['NETMASK:0'])).'/'.mask2cidr($eth0['NETMASK:0']);
$gateway = $eth0['GATEWAY:0'];
$conf[] = "PostUp=ip -4 rule add from $network table $index";
$conf[] = "PostUp=ip -4 route flush table $index";
$conf[] = "PostUp=ip -4 route add default via $tunip table $index";
$conf[] = "PostUp=ip -4 route add $thisnet via $gateway table $index";
$conf[] = "PostDown=ip -4 route flush table $index";
$conf[] = "PostDown=ip -4 rule del from $network table $index";
$conf[] = "PostDown=ip -4 route add unreachable default table $index";
$conf[] = "PostDown=ip -4 route add $thisnet via $gateway table $index";
}
$conf[] = "\n[Peer]";
// add peers, this is only used for peer sections