mod/bridge-port-vlan: show vlan name in log message

This commit is contained in:
Christian Hesse 2022-06-02 10:55:11 +02:00
parent 9942918580
commit 09d88ad91c

View file

@ -36,6 +36,7 @@
/ip/dhcp-client/enable $DHCPClient; /ip/dhcp-client/enable $DHCPClient;
} }
} else={ } else={
:local VlanName $Vlan;
:if ($Vlan != [ :tostr [ :tonum $Vlan ] ]) do={ :if ($Vlan != [ :tostr [ :tonum $Vlan ] ]) do={
:do { :do {
:set $Vlan ([ /interface/bridge/vlan/get [ find where comment=$Vlan ] vlan-ids ]->0); :set $Vlan ([ /interface/bridge/vlan/get [ find where comment=$Vlan ] vlan-ids ]->0);
@ -45,7 +46,7 @@
} }
:if ($BridgePortVal->"disabled" = true || $Vlan != $BridgePortVal->"pvid") do={ :if ($BridgePortVal->"disabled" = true || $Vlan != $BridgePortVal->"pvid") do={
$LogPrintExit2 info $0 ("Enabling bridge port for interface " . $BridgePortVal->"interface" . ", changing to " . $ConfigTo . \ $LogPrintExit2 info $0 ("Enabling bridge port for interface " . $BridgePortVal->"interface" . ", changing to " . $ConfigTo . \
" vlan " . $Vlan . ", disabling dhcp client.") false; " vlan " . $Vlan . [ $IfThenElse ($Vlan != $VlanName) (" (" . $VlanName . ")") ] . ", disabling dhcp client.") false;
:if ([ :len $DHCPClient ] = 1) do={ :if ([ :len $DHCPClient ] = 1) do={
/ip/dhcp-client/disable $DHCPClient; /ip/dhcp-client/disable $DHCPClient;
:delay 200ms; :delay 200ms;