Skip to content
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.

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

Genesis fix for x86_64 #7460

Merged
merged 5 commits into from
Sep 10, 2024
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
8 changes: 8 additions & 0 deletions xCAT-genesis-builder/xcat-cmdline.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 changes: 2 additions & 0 deletions xCAT-genesis-scripts/usr/bin/doxcat
Original file line number Diff line number Diff line change
Expand Up @@ -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
abhishek-sa1 marked this conversation as resolved.
Show resolved Hide resolved
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..."
Expand Down
2 changes: 2 additions & 0 deletions xCAT/postscripts/configeth
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down