From 08658128b3131285830ed1c02a2a482ea684b4b1 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Mon, 15 Jul 2013 01:40:08 +0200 Subject: [PATCH] Revert "platforms: remove vga=xxx from command lines in modeset mode" It is actually needed for splash boot whit no KMS drivers (e.g. virtualbox) This reverts commit 3ee62201d383d2a73e14fc5a0ada0d29bf6c9c00. --- platforms/bootusb-test/post.inc.sh | 2 +- platforms/bootusb/post.inc.sh | 2 +- platforms/flash-1GB/post.inc.sh | 2 +- platforms/installdvd/post.inc.sh | 2 +- platforms/livecd/post.inc.sh | 2 +- platforms/livedvd/post.inc.sh | 2 +- platforms/testcd/post.inc.sh | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/platforms/bootusb-test/post.inc.sh b/platforms/bootusb-test/post.inc.sh index 1f00684..76c6d08 100644 --- a/platforms/bootusb-test/post.inc.sh +++ b/platforms/bootusb-test/post.inc.sh @@ -23,7 +23,7 @@ MENU COLOR TITLE 1;32;49 #ff00993d #00000000 std LABEL kms MENU LABEL default kernel /boot/vmlinuz-${KERNEL_MAJVER}${KERNEL_EXTRAVER} - append initrd=/boot/initramfs-${KERNEL_MAJVER}${KERNEL_EXTRAVER}.img.gz root=live:/openmamba_live/openmamba-live.iso ro selinux=0 quiet splash + append initrd=/boot/initramfs-${KERNEL_MAJVER}${KERNEL_EXTRAVER}.img.gz root=live:/openmamba_live/openmamba-live.iso ro selinux=0 quiet splash vga=789 LABEL vga1024 MENU LABEL VGA 1024x768 (no modeset) kernel /boot/vmlinuz-${KERNEL_MAJVER}${KERNEL_EXTRAVER} diff --git a/platforms/bootusb/post.inc.sh b/platforms/bootusb/post.inc.sh index 62bbeaf..b3aab93 100644 --- a/platforms/bootusb/post.inc.sh +++ b/platforms/bootusb/post.inc.sh @@ -26,7 +26,7 @@ for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do LABEL default-${KERNEL_MAJVER}${K} MENU LABEL default (${KERNEL_MAJVER}${K}) kernel /boot/vmlinuz-${KERNEL_MAJVER}${K} - append initrd=/boot/initramfs-${KERNEL_MAJVER}${K}.img.gz root=live:/openmamba_live/openmamba-live.iso ro selinux=0 quiet splash + append initrd=/boot/initramfs-${KERNEL_MAJVER}${K}.img.gz root=live:/openmamba_live/openmamba-live.iso ro selinux=0 quiet splash vga=792 _EOF done diff --git a/platforms/flash-1GB/post.inc.sh b/platforms/flash-1GB/post.inc.sh index 0091221..46e149d 100644 --- a/platforms/flash-1GB/post.inc.sh +++ b/platforms/flash-1GB/post.inc.sh @@ -32,7 +32,7 @@ MENU COLOR TITLE 1;32;49 #ff00993d #00000000 std LABEL kms MENU LABEL default kernel /boot/vmlinuz-${KERNEL_MAJVER}${KERNEL_EXTRAVER} - append initrd=/boot/initrmfs-${KERNEL_MAJVER}${KERNEL_EXTRAVER}.img.gz root=live:LABEL=${MAKEDIST_TARGET}_${PLATFORM} ro selinux=0 quiet splash + append initrd=/boot/initrmfs-${KERNEL_MAJVER}${KERNEL_EXTRAVER}.img.gz root=live:LABEL=${MAKEDIST_TARGET}_${PLATFORM} ro selinux=0 quiet splash vga=789 LABEL vga1024 MENU LABEL VGA 1024x768 (no modeset) kernel /boot/vmlinuz-${KERNEL_MAJVER}${KERNEL_EXTRAVER} diff --git a/platforms/installdvd/post.inc.sh b/platforms/installdvd/post.inc.sh index e1a4119..bfe8b3b 100644 --- a/platforms/installdvd/post.inc.sh +++ b/platforms/installdvd/post.inc.sh @@ -34,7 +34,7 @@ MENU COLOR TITLE 1;32;49 #ff00993d #00000000 std LABEL kms MENU LABEL default kernel /boot/vmlinuz - append initrd=/boot/initrmfs.gz root=live:LABEL=${MAKEDIST_TARGET}_${PLATFORM} ro selinux=0 quiet splash + append initrd=/boot/initrmfs.gz root=live:LABEL=${MAKEDIST_TARGET}_${PLATFORM} ro selinux=0 quiet splash vga=789 LABEL vga1024 MENU LABEL VGA 1024x768 (no modeset) kernel /boot/vmlinuz diff --git a/platforms/livecd/post.inc.sh b/platforms/livecd/post.inc.sh index 5c3c7e4..df8ac73 100644 --- a/platforms/livecd/post.inc.sh +++ b/platforms/livecd/post.inc.sh @@ -45,7 +45,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 + append initrd=/boot/initrd${ISOID}.gz root=live:LABEL=${MAKEDIST_TARGET}_${PLATFORM} ro selinux=0 quiet splash vga=792 _EOF ISOID=$(($ISOID + 1)) done diff --git a/platforms/livedvd/post.inc.sh b/platforms/livedvd/post.inc.sh index 5c3c7e4..df8ac73 100644 --- a/platforms/livedvd/post.inc.sh +++ b/platforms/livedvd/post.inc.sh @@ -45,7 +45,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 + append initrd=/boot/initrd${ISOID}.gz root=live:LABEL=${MAKEDIST_TARGET}_${PLATFORM} ro selinux=0 quiet splash vga=792 _EOF ISOID=$(($ISOID + 1)) done diff --git a/platforms/testcd/post.inc.sh b/platforms/testcd/post.inc.sh index 5c3c7e4..df8ac73 100644 --- a/platforms/testcd/post.inc.sh +++ b/platforms/testcd/post.inc.sh @@ -45,7 +45,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 + append initrd=/boot/initrd${ISOID}.gz root=live:LABEL=${MAKEDIST_TARGET}_${PLATFORM} ro selinux=0 quiet splash vga=792 _EOF ISOID=$(($ISOID + 1)) done