diff --git a/xCAT-genesis-builder/xcat-cmdline.sh b/xCAT-genesis-builder/xcat-cmdline.sh index 7c7eb7fb27..15ead2175a 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//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 9fe40ba505..0bf5e360a2 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..." diff --git a/xCAT/postscripts/configeth b/xCAT/postscripts/configeth index c6ef87ba1e..0fb9c3733f 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