xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2026-08-04 08:26:59 +00:00
Code Issues Releases Wiki Activity

Merge pull request #7657 from xcat2/backport-7620-to-2.18

Browse Source 
[Backport 2.18] fix(genesis): stop ethtool link-wait loops from spinning forever
This commit is contained in:
Vinícius Ferrão
2026-07-23 17:52:17 -03:00
committed by GitHub
parent 463bf9d660 400fee4e47
commit 387687d8c4
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
xCAT-genesis-scripts/usr/bin/doxcat
+5 -2
View File
@@ -255,8 +255,8 @@ else
NICSTOBRINGUP=`ip link|grep mtu|grep -v LOOPBACK|grep -v $bootnic|grep -v usb|grep -v ,UP|awk -F: '{print $2}'`
export NICSTOBRINGUP
for nic in $NICSTOBRINGUP; do
(while ! ethtool $nic | grep Link\ detected|grep yes > /dev/null; do sleep 5; done; dhclient -cf /etc/dhclient.conf -pf /var/run/dhclient.$nic.pid $nic ) &
(while ! ethtool $nic | grep Link\ detected|grep yes > /dev/null; do sleep 5; done; dhclient -cf /etc/dhclient.conf -6 -pf /var/run/dhclient6.$nic.pid -lf /var/lib/dhclient/dhclient6.leases $nic ) &
(while ! ethtool $nic | grep Link\ detected|grep yes > /dev/null && [ ! -f /tmp/netinitted ]; do sleep 5; done; dhclient -cf /etc/dhclient.conf -pf /var/run/dhclient.$nic.pid $nic ) &
(while ! ethtool $nic | grep Link\ detected|grep yes > /dev/null && [ ! -f /tmp/netinitted ]; do sleep 5; done; dhclient -cf /etc/dhclient.conf -6 -pf /var/run/dhclient6.$nic.pid -lf /var/lib/dhclient/dhclient6.leases $nic ) &
done
gripeiter=101
@@ -270,6 +270,9 @@ else
done
fi
fi
# secondary NICs whose link never comes up would otherwise wait forever;
# let those backgrounded loops exit once the boot NIC has finished net init
touch /tmp/netinitted
openssl genrsa -out /etc/xcat/certkey.pem 4096 > /dev/null 2>&1 &