Merge "update grub cmdline to current kernel parameters"
This commit is contained in:
commit
6822090e22
@ -15,7 +15,7 @@ Arguments
|
||||
|
||||
* ``DIB_BOOTLOADER_DEFAULT_CMDLINE`` sets parameters that are appended
|
||||
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
|
||||
used as a console. It defaults to ``hvc0`` for PowerPC,
|
||||
|
@ -50,6 +50,6 @@ DEFAULT linux
|
||||
|
||||
LABEL linux
|
||||
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
|
||||
_EOF_"
|
||||
|
@ -1,2 +1,2 @@
|
||||
export DIB_BOOTLOADER_DEFAULT_CMDLINE=${DIB_BOOTLOADER_DEFAULT_CMDLINE:-"nofb nomodeset vga=normal"}
|
||||
export DIB_BOOTLOADER_SERIAL_CONSOLE=${DIB_BOOTLOADER_SERIAL_CONSOLE:-""}
|
||||
export DIB_BOOTLOADER_DEFAULT_CMDLINE=${DIB_BOOTLOADER_DEFAULT_CMDLINE:-"nofb nomodeset gfxpayload=text"}
|
||||
export DIB_BOOTLOADER_SERIAL_CONSOLE=${DIB_BOOTLOADER_SERIAL_CONSOLE:-""}
|
||||
|
Loading…
Reference in New Issue
Block a user