xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2026-05-17 11:54:16 +00:00
Code Issues Releases Wiki Activity

Merge pull request #7562 from VersatusHPC/fix/nicutils-bridge-quoting

Browse Source 
fix: use connection UUID in bridge slave setup in NetworkManager
This commit is contained in:
Markus Hilger
2026-05-07 11:57:17 +02:00
committed by GitHub
parent 5bd7bd2112 a6c2bc3790
commit 155e58e4ed
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
xCAT/postscripts/nicutils.sh
+4 -2
View File
@@ -2035,8 +2035,10 @@ function create_bridge_interface_nmcli {
fi
con_use_same_dev=$(wait_nic_connect_intime $_port)
if [ "$con_use_same_dev" != "--" -a -n "$con_use_same_dev" ]; then
cmd="$nmcli con mod "$con_use_same_dev" master $ifname $_mtu connection.autoconnect-priority 9 autoconnect yes connection.autoconnect-slaves 1 connection.autoconnect-retries 0"
xcat_slave_con=$con_use_same_dev
# Resolve to UUID since connection names can contain spaces (e.g. "Wired connection 2")
con_uuid=$($nmcli --get-values connection.uuid c show "$con_use_same_dev")
cmd="$nmcli con mod $con_uuid master $ifname $_mtu connection.autoconnect-priority 9 autoconnect yes connection.autoconnect-slaves 1 connection.autoconnect-retries 0"
xcat_slave_con=$con_uuid
else
cmd="$nmcli con add type $_pretype con-name $xcat_slave_con ifname $_port master $ifname $_mtu connection.autoconnect-priority 9 autoconnect yes connection.autoconnect-slaves 1 connection.autoconnect-retries 0"
fi