From e115e9c2b8968bb40e4459372b4657dddb7c9387 Mon Sep 17 00:00:00 2001 From: Evgenii Shatokhin Date: Sat, 11 Feb 2017 17:26:19 +0300 Subject: [PATCH] Do not use vga=xxx boot options They might confuse syslinux 6+ and the system may start asking the user what to do with that at boot time. --- livecd-tools-21.1.no.vga.opts.patch | 46 +++++++++++++++++++++++++++++ livecd-tools.spec | 3 +- 2 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 livecd-tools-21.1.no.vga.opts.patch diff --git a/livecd-tools-21.1.no.vga.opts.patch b/livecd-tools-21.1.no.vga.opts.patch new file mode 100644 index 0000000..caea745 --- /dev/null +++ b/livecd-tools-21.1.no.vga.opts.patch @@ -0,0 +1,46 @@ +Do not use vga=xxx options + +Looks like syslinux 6.04-pre has trouble with these: the system gets +confused at boot in some cases and starts asking the user what to do. + +Signed-off-by: Evgenii Shatokhin + +diff -Naur livecd-tools-21.1-rosa-patches.orig/imgcreate/live.py livecd-tools-21.1-rosa-patches/imgcreate/live.py +--- livecd-tools-21.1-rosa-patches.orig/imgcreate/live.py 2016-12-03 17:28:22.000000000 +0300 ++++ livecd-tools-21.1-rosa-patches/imgcreate/live.py 2017-02-11 17:16:59.187698760 +0300 +@@ -602,7 +602,7 @@ + liveargs = kern_opts, + long = "Start " + long, + short = "linux" + index, +- extra = "rhgb splash=silent logo.nologo vga=788", ++ extra = "rhgb splash=silent logo.nologo", + help = "", + index = index)) + kern_opts = kernel_options + " install" +@@ -613,7 +613,7 @@ + liveargs = kern_opts, + long = "Install " + long, + short = "linux" + index, +- extra = "rhgb splash=silent logo.nologo vga=788", ++ extra = "rhgb splash=silent logo.nologo", + help = "", + index = index)) + linux.append(self.__get_image_stanza(is_xen, isDracut, +@@ -622,7 +622,7 @@ + liveargs = kern_opts, + long = "Install " + long + " in basic graphics mode", + short = "basic" + index, +- extra = "xdriver=vesa plymouth.enable=0 nomodeset vga=792", ++ extra = "xdriver=vesa plymouth.enable=0 nomodeset", + help = "Try this option out if you're having trouble installing.", + index = index)) + kern_opts = kernel_options +@@ -848,7 +848,7 @@ + cfg += self.__get_efi_image_stanza(fslabel = self.fslabel, + liveargs = kernel_options, + long = "Install " + long + " in basic graphics mode", +- extra = "install nomodeset plymouth.enable=0 vga=792", index = index) ++ extra = "install nomodeset plymouth.enable=0", index = index) + + break + diff --git a/livecd-tools.spec b/livecd-tools.spec index d59b26e..a7dcaf7 100644 --- a/livecd-tools.spec +++ b/livecd-tools.spec @@ -3,7 +3,7 @@ Summary: Tools for building live CDs Name: livecd-tools Version: 21.1 -Release: 29 +Release: 32 Epoch: 1 License: GPLv2+ Group: System/Base @@ -31,6 +31,7 @@ Patch18: livecd-tools-21.1.fixed.boot.menu.os.name.patch Patch19: livecd-tools-21.1.support.efi32.patch Patch20: livecd-tools-21.1.verify.signatures.patch Patch21: livecd-tools-21.1.use.add_drivers.patch +Patch22: livecd-tools-21.1.no.vga.opts.patch Requires: python-imgcreate = %{EVRD} Requires: dosfstools