From cb20b2ae7244f3022df6f6b9b40c4818c3915d48 Mon Sep 17 00:00:00 2001
From: fdupoux <fdupoux@users.sourceforge.net>
Date: Tue, 18 Aug 2020 08:21:24 +0100
Subject: [PATCH] Added an entry in the boot menus to use the nomodeset option
 (#131)

---
 ChangeLog                  |  1 +
 efiboot/grub/grubsrcd.cfg  |  8 +++++++-
 syslinux/sysresccd_sys.cfg | 11 ++++++++++-
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 932595d..7d8ceca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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)
 
 -------------------------------------------------------------------------------
diff --git a/efiboot/grub/grubsrcd.cfg b/efiboot/grub/grubsrcd.cfg
index 35dcb5b..f8b2fc0 100644
--- a/efiboot/grub/grubsrcd.cfg
+++ b/efiboot/grub/grubsrcd.cfg
@@ -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
diff --git a/syslinux/sysresccd_sys.cfg b/syslinux/sysresccd_sys.cfg
index 4314cfe..4e64424 100644
--- a/syslinux/sysresccd_sys.cfg
+++ b/syslinux/sysresccd_sys.cfg
@@ -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