xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-05-21 19:22:05 +00:00
Code Issues Releases Wiki Activity

Merge pull request #7460 from abhishek-sa1/master

Browse Source 
Genesis fix for x86_64
This commit is contained in:
Markus Hilger 2024-09-10 17:17:26 +02:00 committed by GitHub
commit d8ce286412
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
xCAT-genesis-builder/xcat-cmdline.sh
View File

@ -75,6 +75,14 @@ if [[ ${ARCH} =~ ppc64 ]]; then
done
# wait 2+number_of_nics seconds for all the LINKed NICs to be UP
sleep $waittime
elif [[ ${ARCH} =~ x86_64 ]]; then
# load all network driver modules listed in /lib/modules/<kernel>/modules.dep file
KERVER=`uname -r`
for line in `cat /lib/modules/$KERVER/modules.dep |grep -vE 'tunnel|ieee|ifb|bond|dummy|fjes|hv_netvsc|ntb_netdev|xen-netfront|hdlc_fr|dlci'| awk -F: '{print \$1}' | sed -e "s/\(.*\)\.ko.*/\1/"`; do
if [[ $line =~ "kernel/drivers/net" ]]; then
modprobe `basename $line`
fi
done
fi
while :; do screen -dr doxcat || screen -S doxcat -L -ln doxcat; done

2
xCAT-genesis-scripts/usr/bin/doxcat
View File

@ -424,12 +424,14 @@ while :; do
if [ $IPMI_SUPPORT -ne 0 ]; then
# Set boot from network will cause OpenPOWER server wait at petitboot menu, so do nothing here
if uname -m | grep x86_64; then
ipmitool raw 0x00 0x08 0x03 0x08
ipmitool chassis bootdev pxe
fi
fi
reboot -f
elif [ "$dest" = "install" -o "$dest" = "netboot" ]; then
if [ $IPMI_SUPPORT -ne 0 ]; then
ipmitool raw 0x00 0x08 0x03 0x08
ipmitool chassis bootdev pxe
fi
logger -s -t $log_label -p local4.info "Reboot..."

2
xCAT/postscripts/configeth
View File

@ -859,6 +859,7 @@ elif [ "$1" = "-s" ];then
ip link set dev $str_inst_nic down
fi
if [ $networkmanager_active -eq 1 ]; then
nmcli con modify $con_name ipv4.dns "${NAMESERVERS}"
nmcli con reload
nmcli con up $con_name
else
@ -1279,6 +1280,7 @@ else
if_state=0
echo "bring up ip"
if [ $networkmanager_active -eq 1 ]; then
nmcli con modify $con_name ipv4.dns "${NAMESERVERS}"
nmcli con reload
nmcli con up $con_name
else