openstack
/
diskimage-builder
Code Issues Proposed changes

Merge "update grub cmdline to current kernel parameters"

This commit is contained in:
Zuul 2020-06-17 12:15:18 +00:00 committed by Gerrit Code Review
parent 24f2dbb59a 52a8b2fa01
commit 6822090e22
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
diskimage_builder/elements/bootloader/README.rst
View File

@ -15,7 +15,7 @@ Arguments
* ``DIB_BOOTLOADER_DEFAULT_CMDLINE`` sets parameters that are appended * ``DIB_BOOTLOADER_DEFAULT_CMDLINE`` sets parameters that are appended
to the ``GRUB_CMDLINE_LINUX_DEFAULT`` values in ``grub.cfg`` to the ``GRUB_CMDLINE_LINUX_DEFAULT`` values in ``grub.cfg``
configuration. It defaults to ``nofb nomodeset vga=normal``. configuration. It defaults to ``nofb nomodeset gfxpayload=text``.
* ``DIB_BOOTLOADER_SERIAL_CONSOLE`` sets the serial device to be * ``DIB_BOOTLOADER_SERIAL_CONSOLE`` sets the serial device to be
used as a console. It defaults to ``hvc0`` for PowerPC, used as a console. It defaults to ``hvc0`` for PowerPC,

2
diskimage_builder/elements/bootloader/cleanup.d/51-bootloader
View File

@ -50,6 +50,6 @@ DEFAULT linux
LABEL linux LABEL linux
KERNEL /boot/$KERNEL KERNEL /boot/$KERNEL
APPEND ro root=LABEL=${DIB_ROOT_LABEL} console=tty0 console=${SERIAL_CONSOLE} nofb nomodeset vga=normal APPEND ro root=LABEL=${DIB_ROOT_LABEL} console=tty0 console=${SERIAL_CONSOLE} nofb nomodeset gfxpayload=text
INITRD /boot/$RAMDISK INITRD /boot/$RAMDISK
_EOF_" _EOF_"

4
diskimage_builder/elements/bootloader/environment.d/10-bootloader-default-cmdline
View File

@ -1,2 +1,2 @@
export DIB_BOOTLOADER_DEFAULT_CMDLINE=${DIB_BOOTLOADER_DEFAULT_CMDLINE:-"nofb nomodeset vga=normal"} export DIB_BOOTLOADER_DEFAULT_CMDLINE=${DIB_BOOTLOADER_DEFAULT_CMDLINE:-"nofb nomodeset gfxpayload=text"}
export DIB_BOOTLOADER_SERIAL_CONSOLE=${DIB_BOOTLOADER_SERIAL_CONSOLE:-""} export DIB_BOOTLOADER_SERIAL_CONSOLE=${DIB_BOOTLOADER_SERIAL_CONSOLE:-""}