Commit ea2870b2 authored by Mike Hibler's avatar Mike Hibler

Set the --port=P argument even on grub1.

Not sure why I singled out grub1 to not add that argument, it is
documented to work and does. By not setting it, old CentOS images
that used grub1 would hang at boot time for > 5 minutes causing a
stated timeout and reboot. Once stated had tried that 3 times, it
would stop doing the reboot and eventually the node would come up.

I have no idea why it was hanging unless the console output was
going to the real serial port (com1) and that was either generating
garbage input causing grub to go interactive or causing output to
block.
parent d535072d
......@@ -1309,7 +1309,7 @@ dolinux() {
# fix up any terminal_{input,output} lines (for grub2).
#
# For sio[1-3], add:
# serial --unit=N --speed=S
# serial --unit=N --port=P --speed=S
# terminal --dumb --timeout=0 serial console # grub1
# terminal_input serial # grub2
# terminal_output serial # grub2
......@@ -1378,12 +1378,8 @@ dolinux() {
sio*)
u=`expr ${CONSOLE#sio} - 1`
s=$SPEED
pstr="--port=$PORT"
# XXX we only put in the --port=NNN option if this is grub2
if grep -q '^terminal_input' $tgconf 2>/dev/null; then
pstr="--port=$PORT"
fi
# put back the "serial" line
sstr="serial --unit=$u $pstr --speed=$s"
if ! grep -q -- "^$sstr" $tgconf 2>/dev/null; then
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment