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

Merge branch 'master' of github.com:limetech/dynamix-6.2

Browse Source
This commit is contained in:
Tom Mortensen
2016-06-08 08:39:29 -07:00
parent 3c50b7f2f0 b71767287d
commit b432dca403
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
plugins/dynamix/Eth0.page
View File

@@ -90,6 +90,7 @@ function prepareSettings(form) {
item.disabled = false;
if (member.indexOf(',')>0) form.BRSTP.value = 'yes';
}
if (form.DHCP_KEEPRESOLV !== undefined) form.DHCP_KEEPRESOLV.disabled = false;
if (form.TYPE.value == 'access') {
$(form).find('input[name^="VLANID:"]').prop('disabled',true);
$(form).find('input[name^="DESCRIPTION:"]').not('input[name$=":0"]').prop('disabled',true);

6
plugins/dynamix/scripts/netconfig
View File

@@ -48,7 +48,7 @@ if ($bonding = $ini['eth0']['BONDING']=='yes') {
// ensure additional NICs in bond are set free
if ($run && $set=='eth0') foreach ($bond0 as $nic) {
if (isset($old['SYSNICS'])) $nic = ifname($nic);
if ($nic) exec("/etc/rc.d/rc.inet1 {$nic}_stop >/dev/null");
if ($nic && $nic!=$ifname) exec("/etc/rc.d/rc.inet1 {$nic}_stop >/dev/null");
}
}
@@ -56,9 +56,9 @@ if ($bridging = $ini['eth0']['BRIDGING']=='yes') {
$ini['eth0']['BRNICS'] = str_replace(',',' ',$ini['eth0']['BRNICS']);
$br0 = explode(' ',trim(str_replace('eth0','',$ini['eth0']['BRNICS'])));
// ensure additional NICs in bridge are set free
if ($run && $set=='eth0') foreach ($br0 as $nic) {
if ($run && $set=='eth0' && !$bonding) foreach ($br0 as $nic) {
if (isset($old['SYSNICS'])) $nic = ifname($nic);
if ($nic) exec("/etc/rc.d/rc.inet1 {$nic}_stop >/dev/null");
if ($nic && $nic!=$ifname) exec("/etc/rc.d/rc.inet1 {$nic}_stop >/dev/null");
}
}