Merge branch 'nomodeset' into 'master'

Add an entry in the boot menus to use the nomodeset option (#131)

See merge request fdupoux/sysresccd-src!80
This commit is contained in:
Francois Dupoux 2020-08-18 07:39:14 +00:00
commit 89a3a9f3cd
3 changed files with 18 additions and 2 deletions

View file

@ -5,6 +5,7 @@ SystemRescueCd ChangeLog
6.1.8 (YYYY-MM-DD):
-------------------------------------------------------------------------------
* Added support for getting autorun scripts from HTTPS sources (Richard Dumais)
* Added an entry in the boot menus to use the nomodeset option (#131)
* Added hexedit and ghex hexadecimal text editors (#135)
-------------------------------------------------------------------------------

View file

@ -28,12 +28,18 @@ menuentry "Boot SystemRescueCd and copy system to RAM" {
initrd /%INSTALL_DIR%/boot/intel_ucode.img /%INSTALL_DIR%/boot/amd_ucode.img /%INSTALL_DIR%/boot/%ISO_ARCH%/sysresccd.img
}
menuentry "Boot the SystemRescueCd live medium and verify integrity" {
menuentry "Boot SystemRescueCd and verify the integrity of the live medium" {
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
}
menuentry "Boot SystemRescueCd using basic display drivers (nomodeset)" {
set gfxpayload=keep
linux /%INSTALL_DIR%/boot/%ISO_ARCH%/vmlinuz archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% 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" {
set gfxpayload=keep
linux /%INSTALL_DIR%/boot/%ISO_ARCH%/vmlinuz archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% findroot

View file

@ -20,13 +20,22 @@ APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% copytoram
LABEL sysresccd_checksum
TEXT HELP
Boot the SystemRescueCd live medium and verify integrity
Boot SystemRescueCd and verify the integrity of the live medium
ENDTEXT
MENU LABEL Boot SystemRescueCd and and verify integrity
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
LABEL sysresccd_nomodeset
TEXT HELP
Boot using basic display drivers to avoid display issues
ENDTEXT
MENU LABEL Boot SystemRescueCd using basic display drivers
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
LABEL sysresccd_findroot
TEXT HELP
Boot from a Linux operating system installed on the disk