imgcreate/live.py | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
New commits:
commit 5c6835528ef3b6d4f7891676d9933663f4d3ac18
Author: Adam Williamson <awilliam(a)redhat.com>
Date: Fri Nov 15 09:54:27 2013 -0800
add 'troubleshooting' submenu with 'basic graphics mode' to UEFI boot menu
diff --git a/imgcreate/live.py b/imgcreate/live.py
index 2cd4178..7f2d639 100755
--- a/imgcreate/live.py
+++ b/imgcreate/live.py
@@ -791,6 +791,16 @@ search --no-floppy --set=root -l '%(isolabel)s'
long = "Test this media & start " + self.product,
extra = "rd.live.check",
index = index)
+ cfg += """
+submenu 'Troubleshooting -->' {
+"""
+ cfg += self.__get_efi_image_stanza(fslabel = self.fslabel,
+ liveargs = kernel_options,
+ long = "Start " + self.product + " in basic graphics mode",
+ extra = "nomodeset", index = index)
+
+ cfg+= """}
+"""
break
return cfg
commit cad74f5842214f6ae4288aa9bd443b18202a7df6
Author: Adam Williamson <awilliam(a)redhat.com>
Date: Fri Nov 15 09:54:26 2013 -0800
make UEFI boot menu resemble the BIOS and non-live boot menus more
Use product name instead of kernel name, and make "media check & boot" rather
than "just boot" the default.
diff --git a/imgcreate/live.py b/imgcreate/live.py
index af78061..2cd4178 100755
--- a/imgcreate/live.py
+++ b/imgcreate/live.py
@@ -734,7 +734,7 @@ menu end
def __get_basic_efi_config(self, **args):
return """
-set default="0"
+set default="1"
function load_video {
insmod efi_gop
@@ -783,12 +783,12 @@ search --no-floppy --set=root -l '%(isolabel)s'
continue
cfg += self.__get_efi_image_stanza(fslabel = self.fslabel,
liveargs = kernel_options,
- long = name,
+ long = "Start " + self.product,
extra = "", index = index)
if checkisomd5:
cfg += self.__get_efi_image_stanza(fslabel = self.fslabel,
liveargs = kernel_options,
- long = "Verify and Boot " + name,
+ long = "Test this media & start " + self.product,
extra = "rd.live.check",
index = index)
break
commit 739c69f0ccaee0a25ee8fabe4ff891ad6ec409dc
Author: Adam Williamson <awilliam(a)redhat.com>
Date: Fri Nov 15 09:54:25 2013 -0800
drop 'xdriver=vesa' from basic graphics mode parameters (per ajax)
diff --git a/imgcreate/live.py b/imgcreate/live.py
index 4977703..af78061 100755
--- a/imgcreate/live.py
+++ b/imgcreate/live.py
@@ -605,7 +605,7 @@ menu separator
liveargs = kern_opts,
long = "Start " + long + " in ^basic graphics mode.",
short = "basic" + index,
- extra = "xdriver=vesa nomodeset",
+ extra = "nomodeset",
help = "Try this option out if you're having trouble starting.",
index = index))