diff --git a/installer/pxe-network-installer/pxe-network-installer/pxeboot-update.sh b/installer/pxe-network-installer/pxe-network-installer/pxeboot-update.sh index d49df7b3..ab65d59b 100755 --- a/installer/pxe-network-installer/pxe-network-installer/pxeboot-update.sh +++ b/installer/pxe-network-installer/pxe-network-installer/pxeboot-update.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2016-2017 Wind River Systems, Inc. +# Copyright (c) 2016-2023 Wind River Systems, Inc. # # SPDX-License-Identifier: Apache-2.0 # @@ -26,6 +26,7 @@ Arguments: -c : Specify serial console (optional) -b : Specify boot device -r : Specify rootfs device + -H : Delay at init waiting for H/W to be ready (optional) -u : Base url for TIS install progress notification -s : Specify Security Profile mode (optional) -T : Specify whether or not to use tboot (optional) @@ -70,7 +71,7 @@ parms=$@ logger -t $0 " $parms" debian_menus=false -while getopts "i:o:tgc:b:r:u:s:T:k:l:h:d" opt +while getopts "i:o:tgc:b:r:H:u:s:T:k:l:h:d" opt do case $opt in i) @@ -102,6 +103,9 @@ do r) rootfs_device=$OPTARG ;; + H) + hwsettle=$OPTARG + ;; u) tisnotify=$OPTARG ;; @@ -165,6 +169,11 @@ fi if [ "${debian_menus}" = true ] ; then APPEND_OPTIONS="instdev=$instdev" + + if [ -n "$hwsettle" ]; then + APPEND_OPTIONS="$APPEND_OPTIONS insthwsettle=$hwsettle" + fi + else APPEND_OPTIONS="boot_device=$boot_device rootfs_device=$rootfs_device" diff --git a/kickstart/files/kickstart.cfg b/kickstart/files/kickstart.cfg index 8e61dc78..f262e623 100644 --- a/kickstart/files/kickstart.cfg +++ b/kickstart/files/kickstart.cfg @@ -2402,6 +2402,12 @@ if [ $? -ne 0 ]; then add_kernel_option "biosdevname=0" fi +if [ ! -z "${insthwsettle}" ]; then + if [[ ${insthwsettle} =~ ^[0-9]+$ ]]; then + add_kernel_option "hwsettle=${insthwsettle}" + fi +fi + ######################################################################################## ilog "Adding these kernel params to disk boot: ${KERN_OPTS}" diff --git a/kickstart/files/miniboot.cfg b/kickstart/files/miniboot.cfg index 90fbc518..4b33af64 100644 --- a/kickstart/files/miniboot.cfg +++ b/kickstart/files/miniboot.cfg @@ -2517,6 +2517,12 @@ if [ $? -ne 0 ]; then add_kernel_option "biosdevname=0" fi +if [ ! -z "${insthwsettle}" ]; then + if [[ ${insthwsettle} =~ ^[0-9]+$ ]]; then + add_kernel_option "hwsettle=${insthwsettle}" + fi +fi + ######################################################################################## ilog "Adding these kernel params to disk boot: ${KERN_OPTS}"