mirror of
https://github.com/xcat2/xcat-core.git
synced 2026-07-31 10:09:40 +00:00
fix(genesis): only wait 20s for NIC init on ppc64
The genesis boot script sleeps 20 seconds unconditionally with the comment
"wait for NIC initialization", but that wait exists solely for System P LE
(ppc64) hardware discovery -- the surrounding section is explicitly ppc64
only. Every x86_64 and aarch64 node therefore pays a needless 20s delay on
each genesis boot.
Move the sleep inside the `[[ ${ARCH} =~ ppc64 ]]` block so only ppc64 waits.
Applied to the base script and both dracut_105 (el, ubuntu) variants.
Recovered from the unmerged lenovobuild branch (original d0916d9d).
Co-authored-by: Jarrod Johnson <10814490+jjohnson42@users.noreply.github.com>
This commit is contained in:
@@ -46,11 +46,11 @@ while :; do tmux new-session < /dev/tty2 &> /dev/tty2 ; done &
|
||||
|
||||
# The section below is just for System P LE hardware discovery
|
||||
|
||||
# Need to wait for NIC initialization
|
||||
sleep 20
|
||||
ARCH="$(uname -m)"
|
||||
|
||||
if [[ ${ARCH} =~ ppc64 ]]; then
|
||||
# Need to wait for NIC initialization (System P LE discovery only)
|
||||
sleep 20
|
||||
# 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 | awk -F: '{print \$1}' | sed -e "s/\(.*\)\.ko.*/\1/"`; do
|
||||
|
||||
@@ -46,11 +46,11 @@ while :; do screen -ln < /dev/tty2 &> /dev/tty2 ; done &
|
||||
|
||||
# The section below is just for System P LE hardware discovery
|
||||
|
||||
# Need to wait for NIC initialization
|
||||
sleep 20
|
||||
ARCH="$(uname -m)"
|
||||
|
||||
if [[ ${ARCH} =~ ppc64 ]]; then
|
||||
# Need to wait for NIC initialization (System P LE discovery only)
|
||||
sleep 20
|
||||
# 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 | awk -F: '{print \$1}' | sed -e "s/\(.*\)\.ko.*/\1/"`; do
|
||||
|
||||
@@ -46,11 +46,11 @@ while :; do screen -ln < /dev/tty2 &> /dev/tty2 ; done &
|
||||
|
||||
# The section below is just for System P LE hardware discovery
|
||||
|
||||
# Need to wait for NIC initialization
|
||||
sleep 20
|
||||
ARCH="$(uname -m)"
|
||||
|
||||
if [[ ${ARCH} =~ ppc64 ]]; then
|
||||
# Need to wait for NIC initialization (System P LE discovery only)
|
||||
sleep 20
|
||||
# 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 | awk -F: '{print \$1}' | sed -e "s/\(.*\)\.ko.*/\1/"`; do
|
||||
|
||||
Reference in New Issue
Block a user