From 52a8b2fa01a3d1b85057dac2df70f4177e718876 Mon Sep 17 00:00:00 2001
From: Matthew Thode <mthode@mthode.org>
Date: Sun, 14 Jun 2020 00:39:42 -0500
Subject: [PATCH] update grub cmdline to current kernel parameters

vga=normal is depreciated, use gfxpayload=text instead

Change-Id: I2e5be3b07acce14a9f3d47e24938d9da3c5b6c48
---
 diskimage_builder/elements/bootloader/README.rst              | 2 +-
 diskimage_builder/elements/bootloader/cleanup.d/51-bootloader | 2 +-
 .../bootloader/environment.d/10-bootloader-default-cmdline    | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/diskimage_builder/elements/bootloader/README.rst b/diskimage_builder/elements/bootloader/README.rst
index 1c2aefc5..d0352a1a 100644
--- a/diskimage_builder/elements/bootloader/README.rst
+++ b/diskimage_builder/elements/bootloader/README.rst
@@ -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, 
diff --git a/diskimage_builder/elements/bootloader/cleanup.d/51-bootloader b/diskimage_builder/elements/bootloader/cleanup.d/51-bootloader
index 28e02b6a..9d9773e4 100755
--- a/diskimage_builder/elements/bootloader/cleanup.d/51-bootloader
+++ b/diskimage_builder/elements/bootloader/cleanup.d/51-bootloader
@@ -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_"
diff --git a/diskimage_builder/elements/bootloader/environment.d/10-bootloader-default-cmdline b/diskimage_builder/elements/bootloader/environment.d/10-bootloader-default-cmdline
index 2e474f92..a5176b80 100644
--- a/diskimage_builder/elements/bootloader/environment.d/10-bootloader-default-cmdline
+++ b/diskimage_builder/elements/bootloader/environment.d/10-bootloader-default-cmdline
@@ -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:-""}
\ No newline at end of file
+export DIB_BOOTLOADER_DEFAULT_CMDLINE=${DIB_BOOTLOADER_DEFAULT_CMDLINE:-"nofb nomodeset gfxpayload=text"}
+export DIB_BOOTLOADER_SERIAL_CONSOLE=${DIB_BOOTLOADER_SERIAL_CONSOLE:-""}