From 5e7e00ffac61161e99a401968fc8d8d7e34f5c67 Mon Sep 17 00:00:00 2001
From: abhishek-sa1 <abhishek.sa3@dell.com>
Date: Fri, 26 Jul 2024 16:05:15 +0530
Subject: [PATCH 1/4] xcat genesis fix for x86_64

---
 xCAT-genesis-builder/xcat-cmdline.sh | 8 ++++++++
 xCAT-genesis-scripts/usr/bin/doxcat  | 2 ++
 2 files changed, 10 insertions(+)

diff --git a/xCAT-genesis-builder/xcat-cmdline.sh b/xCAT-genesis-builder/xcat-cmdline.sh
index 7c7eb7fb2..15ead2175 100755
--- a/xCAT-genesis-builder/xcat-cmdline.sh
+++ b/xCAT-genesis-builder/xcat-cmdline.sh
@@ -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
diff --git a/xCAT-genesis-scripts/usr/bin/doxcat b/xCAT-genesis-scripts/usr/bin/doxcat
index 9fe40ba50..88b4dca26 100755
--- a/xCAT-genesis-scripts/usr/bin/doxcat
+++ b/xCAT-genesis-scripts/usr/bin/doxcat
@@ -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..."

From 4346aacfd200b9a4eb2c5b432f48e526bef19e69 Mon Sep 17 00:00:00 2001
From: abhishek-sa1 <abhishek.sa3@dell.com>
Date: Fri, 26 Jul 2024 16:05:22 +0530
Subject: [PATCH 2/4] Update configeth

---
 xCAT/postscripts/configeth | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/xCAT/postscripts/configeth b/xCAT/postscripts/configeth
index 38d8a04f1..ef326b82a 100755
--- a/xCAT/postscripts/configeth
+++ b/xCAT/postscripts/configeth
@@ -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

From 88447104e5daecb4f3fcd1412e34b619c9d73068 Mon Sep 17 00:00:00 2001
From: abhishek-sa1 <abhishek.sa3@dell.com>
Date: Wed, 31 Jul 2024 08:54:55 +0530
Subject: [PATCH 3/4] Update doxcat

---
 xCAT-genesis-scripts/usr/bin/doxcat | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xCAT-genesis-scripts/usr/bin/doxcat b/xCAT-genesis-scripts/usr/bin/doxcat
index 88b4dca26..67d5cefb7 100755
--- a/xCAT-genesis-scripts/usr/bin/doxcat
+++ b/xCAT-genesis-scripts/usr/bin/doxcat
@@ -424,14 +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 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 raw 0x00 0x08 0x03 0x08
 		    ipmitool chassis bootdev pxe
 		fi
 		logger -s -t $log_label -p local4.info "Reboot..."

From f89fb8763de8acdcb30815cec31c94eb39be05a1 Mon Sep 17 00:00:00 2001
From: Abhishek S A <abhishek.sa3@dell.com>
Date: Wed, 31 Jul 2024 08:56:28 +0530
Subject: [PATCH 4/4] Update doxcat

---
 xCAT-genesis-scripts/usr/bin/doxcat | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xCAT-genesis-scripts/usr/bin/doxcat b/xCAT-genesis-scripts/usr/bin/doxcat
index 67d5cefb7..0bf5e360a 100755
--- a/xCAT-genesis-scripts/usr/bin/doxcat
+++ b/xCAT-genesis-scripts/usr/bin/doxcat
@@ -424,14 +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 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 raw 0x00 0x08 0x03 0x08
 		    ipmitool chassis bootdev pxe
 		fi
 		logger -s -t $log_label -p local4.info "Reboot..."