Skip to content

Update VLAN removal code to work with 5.10 kernel and newer iproute2 versions #1970

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Pterosaur merged 4 commits into from
Oct 28, 2021
Merged

Update VLAN removal code to work with 5.10 kernel and newer iproute2 versions #1970

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ecef53d
Update VLAN removal code to work with 5.10 kernel and newer iproute2 …
saiarcot895 Oct 19, 2021
d8e40ec
Store the exit code of the bridge vlan show command.
saiarcot895 Oct 21, 2021
b9d3856
Merge commit 'f248e26' into bullseye-master-updates
saiarcot895 Oct 26, 2021
f3170f0
Add missing space.
saiarcot895 Oct 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 14 additions & 6 deletions cfgmgr/vlanmgr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,19 +237,27 @@ bool VlanMgr::removeHostVlanMember(int vlan_id, const string &port_alias)

// The command should be generated as:
// /bin/bash -c '/sbin/bridge vlan del vid {{vlan_id}} dev {{port_alias}} &&
// ( /sbin/bridge vlan show dev {{port_alias}} | /bin/grep -q None;
// ret=$?; if [ $ret -eq 0 ]; then
// ( vlanShow=$(/sbin/bridge vlan show dev {{port_alias}});
// ret=$?;
// if [ $ret -eq 0 ]; then
// if (! echo "$vlanShow" | grep -q {{port_alias}})
// || (echo "$vlanShow" | grep -q None$)
// || (echo "$vlanShow" | grep -q {{port_alias}}$); then
// /sbin/ip link set {{port_alias}} nomaster;
// elif [ $ret -eq 1 ]; then exit 0;
// fi;
// else exit $ret; fi )'

// When port is not member of any VLAN, it shall be detached from Dot1Q bridge!
ostringstream cmds, inner;
inner << BRIDGE_CMD " vlan del vid " + std::to_string(vlan_id) + " dev " << shellquote(port_alias) << " && ( "
BRIDGE_CMD " vlan show dev " << shellquote(port_alias) << " | "
GREP_CMD " -q None; ret=$?; if [ $ret -eq 0 ]; then "
"vlanShow=$(" BRIDGE_CMD " vlan show dev " << shellquote(port_alias) << "); "
"ret=$?; "
"if [ $ret -eq 0 ]; then"
"if (! echo \"$vlanShow\" | " GREP_CMD " -q " << shellquote(port_alias) << ") "
" || (echo \"$vlanShow\" | " GREP_CMD " -q None$) "
" || (echo \"$vlanShow\" | " GREP_CMD " -q " << shellquote(port_alias) << "$); then "
IP_CMD " link set " << shellquote(port_alias) << " nomaster; "
"elif [ $ret -eq 1 ]; then exit 0; "
"fi; "
"else exit $ret; fi )";
cmds << BASH_CMD " -c " << shellquote(inner.str());

Expand Down