nchevsky/systemrescue-zfs
1
0
Fork 0
mirror of https://github.com/nchevsky/systemrescue-zfs.git synced 2026-01-07 01:00:45 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'bootmenus' into 'master'

Browse source 
Make BIOS and UEFI boot menus more consistent (boot entries, screen resolution, colors)

See merge request fdupoux/sysresccd-src!83
This commit is contained in:
Francois Dupoux 2020-08-23 10:53:11 +00:00
parent 8350791321 5ccc3267ac
commit 2eb42d4d21
4 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
ChangeLog
View file

@ -6,6 +6,7 @@ SystemRescueCd ChangeLog
-------------------------------------------------------------------------------
* Added support for getting autorun scripts from HTTPS sources (Richard Dumais)
* Added an entry in the boot menus to use the nomodeset option (#131)
* Make BIOS and UEFI boot menus consistent (descriptions, resolution, colors)
* Added hexedit and ghex hexadecimal text editors (#135)
-------------------------------------------------------------------------------

12
efiboot/grub/grubsrcd.cfg
View file

@ -6,7 +6,11 @@ set pager=1
# Display settings
if loadfont /boot/grub/font.pf2 ; then
set gfxmode=auto
set gfxmode=640x480
set color_normal=black/cyan
set color_highlight=black/light-gray
set menu_color_normal=black/cyan
set menu_color_highlight=black/light-gray
insmod efi_gop
insmod efi_uga
insmod gfxterm
@ -22,13 +26,13 @@ menuentry "Boot SystemRescueCd using default options" {
initrd /%INSTALL_DIR%/boot/intel_ucode.img /%INSTALL_DIR%/boot/amd_ucode.img /%INSTALL_DIR%/boot/%ISO_ARCH%/sysresccd.img
}
menuentry "Boot SystemRescueCd and copy system to RAM" {
menuentry "Boot SystemRescueCd and copy system to RAM (copytoram)" {
set gfxpayload=keep
linux /%INSTALL_DIR%/boot/%ISO_ARCH%/vmlinuz archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% copytoram
initrd /%INSTALL_DIR%/boot/intel_ucode.img /%INSTALL_DIR%/boot/amd_ucode.img /%INSTALL_DIR%/boot/%ISO_ARCH%/sysresccd.img
}
menuentry "Boot SystemRescueCd and verify the integrity of the live medium" {
menuentry "Boot SystemRescueCd and verify integrity of the medium (checksum)" {
set gfxpayload=keep
linux /%INSTALL_DIR%/boot/%ISO_ARCH%/vmlinuz archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% checksum
initrd /%INSTALL_DIR%/boot/intel_ucode.img /%INSTALL_DIR%/boot/amd_ucode.img /%INSTALL_DIR%/boot/%ISO_ARCH%/sysresccd.img
@ -40,7 +44,7 @@ menuentry "Boot SystemRescueCd using basic display drivers (nomodeset)" {
initrd /%INSTALL_DIR%/boot/intel_ucode.img /%INSTALL_DIR%/boot/amd_ucode.img /%INSTALL_DIR%/boot/%ISO_ARCH%/sysresccd.img
}
menuentry "Boot from a Linux operating system installed on the disk" {
menuentry "Boot a Linux operating system installed on the disk (findroot)" {
set gfxpayload=keep
linux /%INSTALL_DIR%/boot/%ISO_ARCH%/vmlinuz archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% findroot
initrd /%INSTALL_DIR%/boot/intel_ucode.img /%INSTALL_DIR%/boot/amd_ucode.img /%INSTALL_DIR%/boot/%ISO_ARCH%/sysresccd.img

4
syslinux/sysresccd_head.cfg
View file

@ -1,7 +1,7 @@
SERIAL 0 38400
UI boot/syslinux/vesamenu.c32
MENU TITLE SYSTEM-RESCUE-CD %ISO_ARCH% %ISO_VERSION% (www.system-rescue-cd.org)
MENU BACKGROUND #c00090f0
MENU BACKGROUND #c000a8a8
TIMEOUT 900
MENU WIDTH 78
@ -12,7 +12,7 @@ MENU CMDLINEROW 22
MENU HELPMSGROW 24
MENU HELPMSGENDROW 37
# Refer to http://syslinux.zytor.com/wiki/index.php/Doc/menu
# Refer to https://wiki.syslinux.org/wiki/index.php?title=Doc/menu
MENU COLOR border 30;44 #40ffffff #a0000000 std
MENU color title 1;31;40 #FFFF0000 #00000000 std

8
syslinux/sysresccd_sys.cfg
View file

@ -13,7 +13,7 @@ LABEL sysresccd_copytoram
TEXT HELP
Boot the SystemRescueCd live medium and copy system to RAM
ENDTEXT
MENU LABEL Boot SystemRescueCd and copy system to RAM
MENU LABEL Boot SystemRescueCd and copy system to RAM (copytoram)
LINUX boot/%ISO_ARCH%/vmlinuz
INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/%ISO_ARCH%/sysresccd.img
APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% copytoram
@ -22,7 +22,7 @@ LABEL sysresccd_checksum
TEXT HELP
Boot SystemRescueCd and verify the integrity of the live medium
ENDTEXT
MENU LABEL Boot SystemRescueCd and and verify integrity
MENU LABEL Boot SystemRescueCd and verify integrity of the medium (checksum)
LINUX boot/%ISO_ARCH%/vmlinuz
INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/%ISO_ARCH%/sysresccd.img
APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% checksum
@ -31,7 +31,7 @@ LABEL sysresccd_nomodeset
TEXT HELP
Boot using basic display drivers to avoid display issues
ENDTEXT
MENU LABEL Boot SystemRescueCd using basic display drivers
MENU LABEL Boot SystemRescueCd using basic display drivers (nomodeset)
LINUX boot/%ISO_ARCH%/vmlinuz
INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/%ISO_ARCH%/sysresccd.img
APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% nomodeset
@ -40,7 +40,7 @@ LABEL sysresccd_findroot
TEXT HELP
Boot from a Linux operating system installed on the disk
ENDTEXT
MENU LABEL Boot from a Linux operating system installed on the disk
MENU LABEL Boot a Linux operating system installed on the disk (findroot)
LINUX boot/%ISO_ARCH%/vmlinuz
INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/%ISO_ARCH%/sysresccd.img
APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% findroot