From 1000e98555232611dd6ca727acdf4a68f51b8d42 Mon Sep 17 00:00:00 2001
From: Martin Gracik <mgracik@redhat.com>
Date: Thu, 12 Jul 2012 10:01:15 +0200
Subject: [PATCH] Cleanup boot menus (#809663)

---
 share/config_files/live/x86/isolinux.cfg | 21 +++++++++-----------
 share/config_files/x86/isolinux.cfg      | 25 +++++++++++-------------
 2 files changed, 20 insertions(+), 26 deletions(-)

diff --git a/share/config_files/live/x86/isolinux.cfg b/share/config_files/live/x86/isolinux.cfg
index 9a05a9e8..e1588347 100644
--- a/share/config_files/live/x86/isolinux.cfg
+++ b/share/config_files/live/x86/isolinux.cfg
@@ -57,29 +57,29 @@ menu tabmsg Press Tab for full configuration options on menu items.
 menu separator # insert an empty line
 menu separator # insert an empty line
 label linux
-  menu label ^Start @PRODUCT@
+  menu label ^Start @PRODUCT@ (default)
   menu default
   kernel vmlinuz
   append initrd=initrd.img @ROOT@ quiet liveimg rd.luks=0 rd.md=0 rd.dm=0
+label check
+  menu label Test this ^media & start @PRODUCT@
+  kernel vmlinuz
+  append initrd=initrd.img @ROOT@ quiet liveimg rd.live.check rd.luks=0 rd.md=0 rd.dm=0
 menu separator # insert an empty line
 # utilities submenu
 menu begin ^Troubleshooting
   menu title Troubleshooting
 label vesa
   menu indent count 5
-  menu label Start @PRODUCT@ in ^basic graphics mode.
+  menu label Start @PRODUCT@ in ^basic graphics mode
   text help
 	Try this option out if you're having trouble installing
 	@PRODUCT@.
   endtext
   kernel vmlinuz
   append initrd=initrd.img @ROOT@ xdriver=vesa nomodeset quiet liveimg rd.luks=0 rd.md=0 rd.dm=0
-label check
-  menu label ^Test this media & start @PRODUCT@
-  kernel vmlinuz
-  append initrd=initrd.img @ROOT@ quiet liveimg rd.live.check rd.luks=0 rd.md=0 rd.dm=0
 label memtest
-  menu label Run a ^memory test.
+  menu label Run a ^memory test
   text help
 	If your system is having issues, a problem with your
 	system's memory may be the cause. Use this utility to
@@ -88,15 +88,12 @@ label memtest
   kernel memtest
 menu separator # insert an empty line
 label local
-  menu label Boot from ^local drive.
+  menu label Boot from ^local drive
   localboot 0xffff
 menu separator # insert an empty line
 menu separator # insert an empty line
 label returntomain
-  menu label Return to ^main menu.
+  menu label Return to ^main menu
   menu exit
 menu end
-#label local
-#  menu label Exit this menu and boot from ^local disk.
-#  localboot 0xffff
 
diff --git a/share/config_files/x86/isolinux.cfg b/share/config_files/x86/isolinux.cfg
index aeb17e4b..7ebc36ef 100644
--- a/share/config_files/x86/isolinux.cfg
+++ b/share/config_files/x86/isolinux.cfg
@@ -57,30 +57,30 @@ menu tabmsg Press Tab for full configuration options on menu items.
 menu separator # insert an empty line
 menu separator # insert an empty line
 label linux
-  menu label ^Install or upgrade @PRODUCT@
-  menu default
+  menu label ^Install/upgrade @PRODUCT@
   kernel vmlinuz
   append initrd=initrd.img @ROOT@ quiet
+label check
+  menu label Test this ^media & install/upgrade @PRODUCT@ (default)
+  menu default
+  kernel vmlinuz
+  append initrd=initrd.img @ROOT@ quiet rd.live.check
 menu separator # insert an empty line
 # utilities submenu
 menu begin ^Troubleshooting
   menu title Troubleshooting
 label vesa
   menu indent count 5
-  menu label Install @PRODUCT@ in ^basic graphics mode.
+  menu label Install/upgrade @PRODUCT@ in ^basic graphics mode
   text help
 	Try this option out if you're having trouble installing
 	@PRODUCT@.
   endtext
   kernel vmlinuz
   append initrd=initrd.img @ROOT@ xdriver=vesa nomodeset quiet
-label check
-  menu label ^Test this media & start @PRODUCT@
-  kernel vmlinuz
-  append initrd=initrd.img @ROOT@ quiet rd.live.check
 label rescue
   menu indent count 5
-  menu label ^Rescue a @PRODUCT@ system.
+  menu label ^Rescue a @PRODUCT@ system
   text help
 	If the system will not boot, this lets you access files
 	and edit config files to try to get it booting again.
@@ -88,7 +88,7 @@ label rescue
   kernel vmlinuz
   append initrd=initrd.img @ROOT@ rescue quiet
 label memtest
-  menu label Run a ^memory test.
+  menu label Run a ^memory test
   text help
 	If your system is having issues, a problem with your
 	system's memory may be the cause. Use this utility to
@@ -97,15 +97,12 @@ label memtest
   kernel memtest
 menu separator # insert an empty line
 label local
-  menu label Boot from ^local drive.
+  menu label Boot from ^local drive
   localboot 0xffff
 menu separator # insert an empty line
 menu separator # insert an empty line
 label returntomain
-  menu label Return to ^main menu.
+  menu label Return to ^main menu
   menu exit
 menu end
-#label local
-#  menu label Exit this menu and boot from ^local disk.
-#  localboot 0xffff