diff --git a/share/config_files/x86/grub.conf b/share/config_files/x86/grub.conf index d1ce3bef..49fa32bd 100644 --- a/share/config_files/x86/grub.conf +++ b/share/config_files/x86/grub.conf @@ -3,11 +3,11 @@ default=0 splashimage=@SPLASHPATH@ timeout 5 hiddenmenu -title @PRODUCT@ @VERSION@ +title Install @PRODUCT@ @VERSION@ findiso - kernel @KERNELPATH@ @ROOT@ + kernel @KERNELPATH@ @ROOT@ quiet initrd @INITRDPATH@ -title Test this media & start @PRODUCT@ +title Test this media & install @PRODUCT@ @VERSION@ findiso - kernel @KERNELPATH@ @ROOT@ quiet rd.live.check + kernel @KERNELPATH@ @ROOT@ rd.live.check quiet initrd @INITRDPATH@ diff --git a/share/config_files/x86/grub2-efi.cfg b/share/config_files/x86/grub2-efi.cfg index f21d085b..49e53c57 100644 --- a/share/config_files/x86/grub2-efi.cfg +++ b/share/config_files/x86/grub2-efi.cfg @@ -20,12 +20,21 @@ set timeout=5 search --no-floppy --set=root -l '@ISOLABEL@' ### BEGIN /etc/grub.d/10_linux ### -menuentry '@PRODUCT@ @VERSION@' --class fedora --class gnu-linux --class gnu --class os { - linuxefi @KERNELPATH@ @ROOT@ +menuentry 'Install @PRODUCT@ @VERSION@' --class fedora --class gnu-linux --class gnu --class os { + linuxefi @KERNELPATH@ @ROOT@ quiet initrdefi @INITRDPATH@ } -menuentry 'Test this media & start @PRODUCT@' --class fedora --class gnu-linux --class gnu --class os { - linuxefi @KERNELPATH@ @ROOT@ quiet rd.live.check +menuentry 'Test this media & install @PRODUCT@ @VERSION@' --class fedora --class gnu-linux --class gnu --class os { + linuxefi @KERNELPATH@ @ROOT@ rd.live.check quiet initrdefi @INITRDPATH@ } - +submenu 'Troubleshooting -->' { + menuentry 'Install @PRODUCT@ @VERSION@ in basic graphics mode' --class fedora --class gnu-linux --class gnu --class os { + linuxefi @KERNELPATH@ @ROOT@ xdriver=vesa nomodeset quiet + initrdefi @INITRDPATH@ + } + menuentry 'Rescue a @PRODUCT@ system' --class fedora --class gnu-linux --class gnu --class os { + linuxefi @KERNELPATH@ @ROOT@ rescue quiet + initrdefi @INITRDPATH@ + } +} diff --git a/share/config_files/x86/isolinux.cfg b/share/config_files/x86/isolinux.cfg index bc5a2f6b..f30b1a65 100644 --- a/share/config_files/x86/isolinux.cfg +++ b/share/config_files/x86/isolinux.cfg @@ -54,30 +54,37 @@ menu color cmdline 0 #ffffffff #00000000 none # Do not display the actual menu unless the user presses a key. All that is displayed is a timeout message. 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 @PRODUCT@ + menu label ^Install @PRODUCT@ @VERSION@ kernel vmlinuz append initrd=initrd.img @ROOT@ quiet + label check - menu label Test this ^media & install @PRODUCT@ + menu label Test this ^media & install @PRODUCT@ @VERSION@ menu default kernel vmlinuz - append initrd=initrd.img @ROOT@ quiet rd.live.check + append initrd=initrd.img @ROOT@ rd.live.check quiet + 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 @PRODUCT@ @VERSION@ in ^basic graphics mode text help Try this option out if you're having trouble installing - @PRODUCT@. + @PRODUCT@ @VERSION@. endtext kernel vmlinuz append initrd=initrd.img @ROOT@ xdriver=vesa nomodeset quiet + label rescue menu indent count 5 menu label ^Rescue a @PRODUCT@ system @@ -87,6 +94,7 @@ label rescue endtext kernel vmlinuz append initrd=initrd.img @ROOT@ rescue quiet + label memtest menu label Run a ^memory test text help @@ -95,14 +103,18 @@ label memtest see if the memory is working correctly. endtext kernel memtest + menu separator # insert an empty line + label local 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 exit -menu end +menu end diff --git a/share/live/config_files/x86/grub.conf b/share/live/config_files/x86/grub.conf index b7fdf822..5afb1cdc 100644 --- a/share/live/config_files/x86/grub.conf +++ b/share/live/config_files/x86/grub.conf @@ -3,11 +3,11 @@ default=0 splashimage=@SPLASHPATH@ timeout 5 hiddenmenu -title @PRODUCT@ @VERSION@ +title Start @PRODUCT@ @VERSION@ findiso - kernel @KERNELPATH@ @ROOT@ rd.live.image rd.luks=0 rd.md=0 rd.dm=0 + kernel @KERNELPATH@ @ROOT@ rd.live.image rd.luks=0 rd.md=0 rd.dm=0 quiet initrd @INITRDPATH@ -title Test this media & start @PRODUCT@ +title Test this media & start @PRODUCT@ @VERSION@ findiso - kernel @KERNELPATH@ @ROOT@ quiet rd.live.image rd.live.check rd.luks=0 rd.md=0 rd.dm=0 + kernel @KERNELPATH@ @ROOT@ rd.live.image rd.luks=0 rd.md=0 rd.dm=0 rd.live.check quiet initrd @INITRDPATH@ diff --git a/share/live/config_files/x86/grub2-efi.cfg b/share/live/config_files/x86/grub2-efi.cfg index 6dea0aa2..51a2bdb5 100644 --- a/share/live/config_files/x86/grub2-efi.cfg +++ b/share/live/config_files/x86/grub2-efi.cfg @@ -20,12 +20,21 @@ set timeout=5 search --no-floppy --set=root -l '@ISOLABEL@' ### BEGIN /etc/grub.d/10_linux ### -menuentry '@PRODUCT@ @VERSION@' --class fedora --class gnu-linux --class gnu --class os { - linuxefi @KERNELPATH@ @ROOT@ quiet rd.live.image rd.luks=0 rd.md=0 rd.dm=0 +menuentry 'Start @PRODUCT@ @VERSION@' --class fedora --class gnu-linux --class gnu --class os { + linuxefi @KERNELPATH@ @ROOT@ rd.live.image rd.luks=0 rd.md=0 rd.dm=0 quiet initrdefi @INITRDPATH@ } -menuentry 'Test this media & start @PRODUCT@' --class fedora --class gnu-linux --class gnu --class os { - linuxefi @KERNELPATH@ @ROOT@ quiet rd.live.image rd.live.check rd.luks=0 rd.md=0 rd.dm=0 +menuentry 'Test this media & start @PRODUCT@ @VERSION@' --class fedora --class gnu-linux --class gnu --class os { + linuxefi @KERNELPATH@ @ROOT@ rd.live.image rd.luks=0 rd.md=0 rd.dm=0 rd.live.check quiet initrdefi @INITRDPATH@ } - +submenu 'Troubleshooting -->' { + menuentry 'Start @PRODUCT@ @VERSION@ in basic graphics mode' --class fedora --class gnu-linux --class gnu --class os { + linuxefi @KERNELPATH@ @ROOT@ rd.live.image rd.luks=0 rd.md=0 rd.dm=0 xdriver=vesa nomodeset quiet + initrdefi @INITRDPATH@ + } + menuentry 'Rescue a @PRODUCT@ system' --class fedora --class gnu-linux --class gnu --class os { + linuxefi @KERNELPATH@ @ROOT@ rd.live.image rd.luks=0 rd.md=0 rd.dm=0 rescue quiet + initrdefi @INITRDPATH@ + } +} diff --git a/share/live/config_files/x86/isolinux.cfg b/share/live/config_files/x86/isolinux.cfg index 6dafb264..3a368a01 100644 --- a/share/live/config_files/x86/isolinux.cfg +++ b/share/live/config_files/x86/isolinux.cfg @@ -1,7 +1,7 @@ default vesamenu.c32 timeout 600 -menu autoboot Starting @PRODUCT@ in # second{,s}. Press any key to interrupt. +display boot.msg # Clear the screen when exiting the menu, instead of leaving the menu displayed. # For vesamenu, this means the graphical background is still displayed without @@ -54,30 +54,47 @@ menu color cmdline 0 #ffffffff #00000000 none # Do not display the actual menu unless the user presses a key. All that is displayed is a timeout message. 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@ @VERSION@ + kernel vmlinuz + append initrd=initrd.img @ROOT@ rd.live.image rd.luks=0 rd.md=0 rd.dm=0 quiet + +label check + menu label Test this ^media & start @PRODUCT@ @VERSION@ menu default kernel vmlinuz - append initrd=initrd.img @ROOT@ quiet rd.live.image 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 rd.live.image rd.live.check rd.luks=0 rd.md=0 rd.dm=0 + append initrd=initrd.img @ROOT@ rd.live.image rd.luks=0 rd.md=0 rd.dm=0 rd.live.check quiet + 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@ @VERSION@ in ^basic graphics mode text help - Try this option out if you're having trouble installing - @PRODUCT@. + Try this option out if you're having trouble starting + @PRODUCT@ @VERSION@. endtext kernel vmlinuz - append initrd=initrd.img @ROOT@ xdriver=vesa nomodeset quiet rd.live.image rd.luks=0 rd.md=0 rd.dm=0 + append initrd=initrd.img @ROOT@ rd.live.image rd.luks=0 rd.md=0 rd.dm=0 xdriver=vesa nomodeset quiet + +label rescue + menu indent count 5 + 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. + endtext + kernel vmlinuz + append initrd=initrd.img @ROOT@ rd.live.image rd.luks=0 rd.md=0 rd.dm=0 rescue quiet + label memtest menu label Run a ^memory test text help @@ -86,14 +103,18 @@ label memtest see if the memory is working correctly. endtext kernel memtest + menu separator # insert an empty line + label local 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 exit -menu end +menu end