diff --git a/diskimage_builder/elements/bootloader/cleanup.d/51-bootloader b/diskimage_builder/elements/bootloader/cleanup.d/51-bootloader index 28202f8bf..1ba0485ee 100755 --- a/diskimage_builder/elements/bootloader/cleanup.d/51-bootloader +++ b/diskimage_builder/elements/bootloader/cleanup.d/51-bootloader @@ -38,11 +38,18 @@ fi # Dig up the initrd and kernel to use. select_boot_kernel_initrd $TARGET_ROOT +# Serial console on Power is hvc0 +if [ "powerpc ppc64 ppc64le" =~ "$ARCH" ] ; then + SERIAL_CONSOLE="hvc0" +else + SERIAL_CONSOLE="ttyS0,115200" +fi + sudo sh -c "cat > $CONF <<_EOF_ DEFAULT linux LABEL linux KERNEL /boot/$KERNEL - APPEND ro root=LABEL=${DIB_ROOT_LABEL} console=tty0 console=ttyS0,115200 nofb nomodeset vga=normal + APPEND ro root=LABEL=${DIB_ROOT_LABEL} console=tty0 console=${SERIAL_CONSOLE} nofb nomodeset vga=normal INITRD /boot/$RAMDISK _EOF_" diff --git a/diskimage_builder/elements/bootloader/finalise.d/50-bootloader b/diskimage_builder/elements/bootloader/finalise.d/50-bootloader index 875fbcf78..162e4ab01 100755 --- a/diskimage_builder/elements/bootloader/finalise.d/50-bootloader +++ b/diskimage_builder/elements/bootloader/finalise.d/50-bootloader @@ -145,7 +145,17 @@ function install_grub2 { echo "GRUB_TIMEOUT=${DIB_GRUB_TIMEOUT:-5}" >>/etc/default/grub echo 'GRUB_TERMINAL="serial console"' >>/etc/default/grub echo 'GRUB_GFXPAYLOAD_LINUX=text' >>/etc/default/grub - echo 'GRUB_CMDLINE_LINUX_DEFAULT="console=tty0 console=ttyS0,115200 no_timer_check"' >>/etc/default/grub + + # Serial console on Power is hvc0 + if [ "powerpc ppc64 ppc64le" =~ "$ARCH" ] ; then + SERIAL_CONSOLE="hvc0" + else + SERIAL_CONSOLE="ttyS0,115200" + fi + + GRUB_CMDLINE_LINUX_DEFAULT="console=tty0 console=${SERIAL_CONSOLE} no_timer_check" + + echo "GRUB_CMDLINE_LINUX_DEFAULT=\"${GRUB_CMDLINE_LINUX_DEFAULT}\"" >>/etc/default/grub echo 'GRUB_SERIAL_COMMAND="serial --speed=115200 --unit=0 --word=8 --parity=no --stop=1"' >>/etc/default/grub if type grub2-mkconfig >/dev/null; then GRUB_MKCONFIG="grub2-mkconfig -o $GRUB_CFG"