almalinux/lorax
13
0
Fork 0
Code Issues Pull Requests Releases Activity

Make boot configs consistent.

Browse Source 
Make kernel args the same in every config.
Put 'quiet' at the end of the line - it's usually the first thing a user removes when debugging.
Fill missing product versions in.
Distinguish between 'install' (installation media) and 'start' (live media).
This commit is contained in:
Daniel Mach 2013-01-25 11:56:08 +01:00
parent f921a362f9
commit d79e250b9b
6 changed files with 87 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
share/config_files/x86/grub.conf
View File

@ -3,11 +3,11 @@ default=0
splashimage=@SPLASHPATH@ splashimage=@SPLASHPATH@
timeout 5 timeout 5
hiddenmenu hiddenmenu
title @PRODUCT@ @VERSION@ title Install @PRODUCT@ @VERSION@
findiso findiso
kernel @KERNELPATH@ @ROOT@ kernel @KERNELPATH@ @ROOT@ quiet
initrd @INITRDPATH@ initrd @INITRDPATH@
title Test this media & start @PRODUCT@ title Test this media & install @PRODUCT@ @VERSION@
findiso findiso
kernel @KERNELPATH@ @ROOT@ quiet rd.live.check kernel @KERNELPATH@ @ROOT@ rd.live.check quiet
initrd @INITRDPATH@ initrd @INITRDPATH@

19
share/config_files/x86/grub2-efi.cfg
View File

@ -20,12 +20,21 @@ set timeout=5
search --no-floppy --set=root -l '@ISOLABEL@' search --no-floppy --set=root -l '@ISOLABEL@'
### BEGIN /etc/grub.d/10_linux ### ### BEGIN /etc/grub.d/10_linux ###
menuentry '@PRODUCT@ @VERSION@' --class fedora --class gnu-linux --class gnu --class os { menuentry 'Install @PRODUCT@ @VERSION@' --class fedora --class gnu-linux --class gnu --class os {
linuxefi @KERNELPATH@ @ROOT@ linuxefi @KERNELPATH@ @ROOT@ quiet
initrdefi @INITRDPATH@ initrdefi @INITRDPATH@
} }
menuentry 'Test this media & start @PRODUCT@' --class fedora --class gnu-linux --class gnu --class os { menuentry 'Test this media & install @PRODUCT@ @VERSION@' --class fedora --class gnu-linux --class gnu --class os {
linuxefi @KERNELPATH@ @ROOT@ quiet rd.live.check linuxefi @KERNELPATH@ @ROOT@ rd.live.check quiet
initrdefi @INITRDPATH@ 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@
}
}

24
share/config_files/x86/isolinux.cfg
View File

@ -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. # 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 tabmsg Press Tab for full configuration options on menu items.
menu separator # insert an empty line menu separator # insert an empty line
menu separator # insert an empty line menu separator # insert an empty line
label linux label linux
menu label ^Install @PRODUCT@ menu label ^Install @PRODUCT@ @VERSION@
kernel vmlinuz kernel vmlinuz
append initrd=initrd.img @ROOT@ quiet append initrd=initrd.img @ROOT@ quiet
label check label check
menu label Test this ^media & install @PRODUCT@ menu label Test this ^media & install @PRODUCT@ @VERSION@
menu default menu default
kernel vmlinuz 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 menu separator # insert an empty line
# utilities submenu # utilities submenu
menu begin ^Troubleshooting menu begin ^Troubleshooting
menu title Troubleshooting menu title Troubleshooting
label vesa label vesa
menu indent count 5 menu indent count 5
menu label Install @PRODUCT@ in ^basic graphics mode menu label Install @PRODUCT@ @VERSION@ in ^basic graphics mode
text help text help
Try this option out if you're having trouble installing Try this option out if you're having trouble installing
@PRODUCT@. @PRODUCT@ @VERSION@.
endtext endtext
kernel vmlinuz kernel vmlinuz
append initrd=initrd.img @ROOT@ xdriver=vesa nomodeset quiet append initrd=initrd.img @ROOT@ xdriver=vesa nomodeset quiet
label rescue label rescue
menu indent count 5 menu indent count 5
menu label ^Rescue a @PRODUCT@ system menu label ^Rescue a @PRODUCT@ system
@ -87,6 +94,7 @@ label rescue
endtext endtext
kernel vmlinuz kernel vmlinuz
append initrd=initrd.img @ROOT@ rescue quiet append initrd=initrd.img @ROOT@ rescue quiet
label memtest label memtest
menu label Run a ^memory test menu label Run a ^memory test
text help text help
@ -95,14 +103,18 @@ label memtest
see if the memory is working correctly. see if the memory is working correctly.
endtext endtext
kernel memtest kernel memtest
menu separator # insert an empty line menu separator # insert an empty line
label local label local
menu label Boot from ^local drive menu label Boot from ^local drive
localboot 0xffff localboot 0xffff
menu separator # insert an empty line menu separator # insert an empty line
menu separator # insert an empty line menu separator # insert an empty line
label returntomain label returntomain
menu label Return to ^main menu menu label Return to ^main menu
menu exit menu exit
menu end
menu end

8
share/live/config_files/x86/grub.conf
View File

@ -3,11 +3,11 @@ default=0
splashimage=@SPLASHPATH@ splashimage=@SPLASHPATH@
timeout 5 timeout 5
hiddenmenu hiddenmenu
title @PRODUCT@ @VERSION@ title Start @PRODUCT@ @VERSION@
findiso 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@ initrd @INITRDPATH@
title Test this media & start @PRODUCT@ title Test this media & start @PRODUCT@ @VERSION@
findiso 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@ initrd @INITRDPATH@

19
share/live/config_files/x86/grub2-efi.cfg
View File

@ -20,12 +20,21 @@ set timeout=5
search --no-floppy --set=root -l '@ISOLABEL@' search --no-floppy --set=root -l '@ISOLABEL@'
### BEGIN /etc/grub.d/10_linux ### ### BEGIN /etc/grub.d/10_linux ###
menuentry '@PRODUCT@ @VERSION@' --class fedora --class gnu-linux --class gnu --class os { menuentry 'Start @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 linuxefi @KERNELPATH@ @ROOT@ rd.live.image rd.luks=0 rd.md=0 rd.dm=0 quiet
initrdefi @INITRDPATH@ initrdefi @INITRDPATH@
} }
menuentry 'Test this media & start @PRODUCT@' --class fedora --class gnu-linux --class gnu --class os { menuentry 'Test this media & start @PRODUCT@ @VERSION@' --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 linuxefi @KERNELPATH@ @ROOT@ rd.live.image rd.luks=0 rd.md=0 rd.dm=0 rd.live.check quiet
initrdefi @INITRDPATH@ 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@
}
}

45
share/live/config_files/x86/isolinux.cfg
View File

@ -1,7 +1,7 @@
default vesamenu.c32 default vesamenu.c32
timeout 600 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. # Clear the screen when exiting the menu, instead of leaving the menu displayed.
# For vesamenu, this means the graphical background is still displayed without # 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. # 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 tabmsg Press Tab for full configuration options on menu items.
menu separator # insert an empty line menu separator # insert an empty line
menu separator # insert an empty line menu separator # insert an empty line
label linux 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 menu default
kernel vmlinuz kernel vmlinuz
append initrd=initrd.img @ROOT@ 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 rd.live.check quiet
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
menu separator # insert an empty line menu separator # insert an empty line
# utilities submenu # utilities submenu
menu begin ^Troubleshooting menu begin ^Troubleshooting
menu title Troubleshooting menu title Troubleshooting
label vesa label vesa
menu indent count 5 menu indent count 5
menu label Start @PRODUCT@ in ^basic graphics mode menu label Start @PRODUCT@ @VERSION@ in ^basic graphics mode
text help text help
Try this option out if you're having trouble installing Try this option out if you're having trouble starting
@PRODUCT@. @PRODUCT@ @VERSION@.
endtext endtext
kernel vmlinuz 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 label memtest
menu label Run a ^memory test menu label Run a ^memory test
text help text help
@ -86,14 +103,18 @@ label memtest
see if the memory is working correctly. see if the memory is working correctly.
endtext endtext
kernel memtest kernel memtest
menu separator # insert an empty line menu separator # insert an empty line
label local label local
menu label Boot from ^local drive menu label Boot from ^local drive
localboot 0xffff localboot 0xffff
menu separator # insert an empty line menu separator # insert an empty line
menu separator # insert an empty line menu separator # insert an empty line
label returntomain label returntomain
menu label Return to ^main menu menu label Return to ^main menu
menu exit menu exit
menu end
menu end