From cb64ed700e7a1bf037c2dcb3586d17a2ccaa6ca9 Mon Sep 17 00:00:00 2001
From: Silvan Calarco <silvan.calarco@mambasoft.it>
Date: Sat, 21 May 2022 10:05:04 +0200
Subject: [PATCH] livecd, livedvd: remove VGA= to fix VirtualBox boot with
 vmsvga

---
 platforms/livecd/post.inc.sh  | 6 +++---
 platforms/livedvd/post.inc.sh | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/platforms/livecd/post.inc.sh b/platforms/livecd/post.inc.sh
index 0d4b6d8..7270b17 100644
--- a/platforms/livecd/post.inc.sh
+++ b/platforms/livecd/post.inc.sh
@@ -49,7 +49,7 @@ for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do
 LABEL default-${KERNEL_MAJVER}${K}
 MENU LABEL default (${KERNEL_MAJVER}${K})
  kernel /boot/vmlinuz${ISOID}
- append initrd=/boot/initrd${ISOID}.gz root=live:LABEL=${MAKEDIST_TARGET}_${PLATFORM} ro selinux=0 quiet splash vga=792
+ append initrd=/boot/initrd${ISOID}.gz root=live:LABEL=${MAKEDIST_TARGET}_${PLATFORM} ro selinux=0 quiet splash
 _EOF
    ISOID=$(($ISOID + 1))
 done
@@ -61,7 +61,7 @@ for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do
 LABEL vga800-${KERNEL_MAJVER}${K}
 MENU LABEL VGA 800x600 no modeset (${KERNEL_MAJVER}${K})
  kernel /boot/vmlinuz${ISOID}
- append initrd=/boot/initrd${ISOID}.gz root=live:LABEL=${MAKEDIST_TARGET}_${PLATFORM} ro selinux=0 quiet splash vga=789 nomodeset
+ append initrd=/boot/initrd${ISOID}.gz root=live:LABEL=${MAKEDIST_TARGET}_${PLATFORM} ro selinux=0 quiet splash nomodeset
 _EOF
    ISOID=$(($ISOID + 1))
 done
@@ -72,7 +72,7 @@ for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do
 LABEL vga1024-${KERNEL_MAJVER}${K}
 MENU LABEL VGA 1024x768 no modeset (${KERNEL_MAJVER}${K})
  kernel /boot/vmlinuz${ISOID}
- append initrd=/boot/initrd${ISOID}.gz root=live:LABEL=${MAKEDIST_TARGET}_${PLATFORM} ro selinux=0 quiet splash vga=792 nomodeset
+ append initrd=/boot/initrd${ISOID}.gz root=live:LABEL=${MAKEDIST_TARGET}_${PLATFORM} ro selinux=0 quiet splash nomodeset
 _EOF
    ISOID=$(($ISOID + 1))
 done
diff --git a/platforms/livedvd/post.inc.sh b/platforms/livedvd/post.inc.sh
index d76d7fd..7e8f2fe 100644
--- a/platforms/livedvd/post.inc.sh
+++ b/platforms/livedvd/post.inc.sh
@@ -69,7 +69,7 @@ _EOF
  LABEL default-${KERNEL_MAJVER}${K}
   MENU LABEL default (${KERNEL_MAJVER}${K} $l)
    kernel /boot/vmlinuz${ISOID}
-   append initrd=/boot/initrd${ISOID}.gz root=live:LABEL=${MAKEDIST_TARGET}_${PLATFORM} ro selinux=0 quiet splash vga=792 locale.LANG=$LOCALELANG vconsole.keymap=$VCONSOLEKEYMAP
+   append initrd=/boot/initrd${ISOID}.gz root=live:LABEL=${MAKEDIST_TARGET}_${PLATFORM} ro selinux=0 quiet splash locale.LANG=$LOCALELANG vconsole.keymap=$VCONSOLEKEYMAP
 _EOF
       ISOID=$(($ISOID + 1))
    done
@@ -81,7 +81,7 @@ _EOF
  LABEL vga800-${KERNEL_MAJVER}${K}
   MENU LABEL VGA 800x600 no modeset (${KERNEL_MAJVER}${K} $l)
    kernel /boot/vmlinuz${ISOID}
-   append initrd=/boot/initrd${ISOID}.gz root=live:LABEL=${MAKEDIST_TARGET}_${PLATFORM} ro selinux=0 quiet splash vga=789 locale.LANG=$LOCALELANG vconsole.keymap=$VCONSOLEKEYMAP nomodeset
+   append initrd=/boot/initrd${ISOID}.gz root=live:LABEL=${MAKEDIST_TARGET}_${PLATFORM} ro selinux=0 quiet splash locale.LANG=$LOCALELANG vconsole.keymap=$VCONSOLEKEYMAP nomodeset
 _EOF
       ISOID=$(($ISOID + 1))
    done
@@ -92,7 +92,7 @@ _EOF
  LABEL vga1024-${KERNEL_MAJVER}${K}
   MENU LABEL VGA 1024x768 no modeset (${KERNEL_MAJVER}${K} $l)
    kernel /boot/vmlinuz${ISOID}
-   append initrd=/boot/initrd${ISOID}.gz root=live:LABEL=${MAKEDIST_TARGET}_${PLATFORM} ro selinux=0 quiet splash vga=792 locale.LANG=$LOCALELANG vconsole.keymap=$VCONSOLEKEYMAP nomodeset
+   append initrd=/boot/initrd${ISOID}.gz root=live:LABEL=${MAKEDIST_TARGET}_${PLATFORM} ro selinux=0 quiet splash locale.LANG=$LOCALELANG vconsole.keymap=$VCONSOLEKEYMAP nomodeset
 _EOF
       ISOID=$(($ISOID + 1))
    done