Merge pull request #230 from grml/jkirk/cheatcodes

Update Grml cheatcodes + clean up isolinux bootprompt options
grml · Dec 19, 2024 · d8cc3e7 · d8cc3e7
2 parents 2f91369 + 8becc73
commit d8cc3e7
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 29 deletions.
diff --git a/templates/GRML/grml-cheatcodes.txt b/templates/GRML/grml-cheatcodes.txt
@@ -15,9 +15,10 @@ fb1280x1024                           Use fixed framebuffer graphics (1)
 fb1024x768                            Use fixed framebuffer graphics (2) [notice: Grml's default]
 fb800x600                             Use fixed framebuffer graphics (3)
 nofb                                  Disable framebuffer
-floppy                                Boot from floppydisk
-hd / hd1 / hd2 / hd3                  Boot from (local) primary / secondary /... harddisk
-debug                                 Get shells during process of booting for debugging
+floppy                                Boot from primary floppy drive
+hd / hd1 /hd2 / hd3                   Boot from first .. fourth primary partition of (local) harddisk
+hd0 / fd0                             Chainload MBR from first harddisk / floppy drive
+debug                                 Be verbose during the process of booting for debugging
 forensic                              Do not touch any harddisks during hardware recognition
 serial                                Activate ttyS0 and start a getty
 grub                                  Boot Grub bootloader
@@ -27,6 +28,8 @@ Further documentation regarding the boot process can be found at:
 * https://manpages.debian.org/live-boot-doc/live-boot.7.en.html
 * https://manpages.debian.org/initramfs-tools-core/initramfs-tools.7.en.html
 * https://www.kernel.org/doc/html/latest/admin-guide/kernel-parameters.html
+* https://wiki.syslinux.org/wiki/index.php?title=SYSLINUX
+* https://wiki.syslinux.org/wiki/index.php?title=Doc/chain + https://wiki.syslinux.org/wiki/index.php?title=Comboot/chain.c32
 
 The following boot options can be combined.
 Notice: not all of them are available on all the Grml flavours.
@@ -149,14 +152,9 @@ grml ignore_bootid                    Disable bootid verification.
 
 Debugging related settings:
 ---------------------------
-grml debug                            Get shells during process of booting, using GNU screen, be verbose
-grml debug=1                          Get shells during process of booting, using GNU screen, be verbose and
-                                      display shell code being executed in initramfs.
-grml debug=noscreen                   Get shells during process of booting, verbose, but without using GNU screen
 grml nocolor                          Disable colorized output while booting
                                       Also set SYSTEMD_COLORS=0 to disable colors in systemd output
 grml log                              Log error messages while booting to /tmp/grml.log.`date +%Y%m%d`"
-                                      and /var/log/boot
 grml testcd                           Check CD data integrity and md5sums
 
 Security / login related settings:

diff --git a/templates/boot/grub/%SHORT_NAME%_options.cfg b/templates/boot/grub/%SHORT_NAME%_options.cfg
@@ -66,7 +66,7 @@ menuentry "Graphical Mode" {
 menuentry "Disable Framebuffer" {
     set gfxpayload=text
     echo 'Loading kernel...'
-    linux  /boot/%SHORT_NAME%/vmlinuz apm=power-off boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% nomce net.ifnames=0 "${loopback}" ${kernelopts} video=ofonly radeon.modeset=0 i915.modeset=0 nouveau.modeset=0 cirrus.modeset=0 mgag200.modeset=0 nomodeset 
+    linux  /boot/%SHORT_NAME%/vmlinuz apm=power-off boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% nomce net.ifnames=0 "${loopback}" ${kernelopts} radeon.modeset=0 i915.modeset=0 nouveau.modeset=0 cirrus.modeset=0 mgag200.modeset=0 nomodeset 
     echo 'Loading initrd...'
     initrd /boot/%SHORT_NAME%/initrd.img
 }

diff --git a/templates/boot/isolinux/hidden.cfg b/templates/boot/isolinux/hidden.cfg
@@ -3,26 +3,11 @@ menu hide
 kernel /boot/%SHORT_NAME%/vmlinuz
 append apm=power-off vga=791 initrd=/boot/%SHORT_NAME%/initrd.img boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% splash nomce net.ifnames=0 
 
-label debug
-menu hide
-kernel /boot/%SHORT_NAME%/vmlinuz
-append apm=power-off vga=791 verbose debug=vc initrd=/boot/%SHORT_NAME%/initrd.img boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% initcall_debug nomce net.ifnames=0 
-
 label grmlx
 menu hide
 kernel /boot/%SHORT_NAME%/vmlinuz
 append apm=power-off startx vga=791 initrd=/boot/%SHORT_NAME%/initrd.img boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% nomce net.ifnames=0 
 
-label nofb
-menu hide
-kernel /boot/%SHORT_NAME%/vmlinuz
-append apm=power-off vga=normal video=ofonly initrd=/boot/%SHORT_NAME%/initrd.img boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% nomce net.ifnames=0 radeon.modeset=0 i915.modeset=0 nouveau.modeset=0 cirrus.modeset=0 mgag200.modeset=0 nomodeset 
-
-label nokms
-menu hide
-kernel /boot/%SHORT_NAME%/vmlinuz
-append apm=power-off initrd=/boot/%SHORT_NAME%/initrd.img boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% radeon.modeset=0 i915.modeset=0 nouveau.modeset=0 cirrus.modeset=0 mgag200.modeset=0 nomodeset nomce net.ifnames=0 vga=791 
-
 label vmlinuz
 menu hide
 kernel /boot/%SHORT_NAME%/vmlinuz
@@ -48,11 +33,6 @@ menu hide
 kernel /boot/%SHORT_NAME%/vmlinuz
 append apm=power-off vga=788 initrd=/boot/%SHORT_NAME%/initrd.img boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% nomce net.ifnames=0 
 
-label serial
-menu hide
-kernel /boot/%SHORT_NAME%/vmlinuz
-append apm=power-off vga=normal video=vesafb:off initrd=/boot/%SHORT_NAME%/initrd.img boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% nomce net.ifnames=0 console=tty1 console=ttyS0,115200n8 
-
 label userdef
 menu hide
 menu hide