From 4800d8bcbd66bbac5c4a37999d9e1bc2a0f7f1d8 Mon Sep 17 00:00:00 2001 From: bergware Date: Wed, 8 Jun 2016 10:33:51 +0200 Subject: [PATCH] Fixed DNS display and console errors in networking --- plugins/dynamix/Eth0.page | 1 + plugins/dynamix/scripts/netconfig | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/plugins/dynamix/Eth0.page b/plugins/dynamix/Eth0.page index d32175c3e..f63ac23b8 100644 --- a/plugins/dynamix/Eth0.page +++ b/plugins/dynamix/Eth0.page @@ -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); diff --git a/plugins/dynamix/scripts/netconfig b/plugins/dynamix/scripts/netconfig index c5f4f8b36..5413d4ff4 100755 --- a/plugins/dynamix/scripts/netconfig +++ b/plugins/dynamix/scripts/netconfig @@ -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"); } }