Skip to content

Commit

Permalink
Merge pull request #226 from grml/mika/addonscfg
Browse files Browse the repository at this point in the history
templates: drop deprecated boot addons from isolinux/grub configs and grml-cheatcodes.txt
  • Loading branch information
zeha authored Dec 19, 2024
2 parents fd36780 + f81528f commit 5871571
Show file tree
Hide file tree
Showing 7 changed files with 3 additions and 46 deletions.
3 changes: 1 addition & 2 deletions templates/GRML/grml-cheatcodes.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@ hd / hd1 / hd2 / hd3 Boot from (local) primary / secondary /...
debug Get shells during 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 (special all-in-one-image)
dos Boot FreeDOS
grub Boot Grub bootloader
hdt Boot Hardware Detection Tool (from syslinux project)

Further documentation regarding the boot process can be found at:
Expand Down
18 changes: 0 additions & 18 deletions templates/boot/grub/addons.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -71,22 +71,4 @@ menuentry "Netboot.xyz" {
fi
}

if [ "${grub_platform}" != "efi" ] ; then
menuentry "Netboot.xyz" {
insmod linux16
linux16 /boot/addons/netboot.xyz.lkrn
}

menuentry "GRUB - all in one image" {
insmod linux16
linux16 /boot/addons/memdisk
initrd16 /boot/addons/allinone.img
}

menuentry "FreeDOS" {
insmod linux16
linux16 /boot/addons/memdisk
initrd16 /boot/addons/balder10.imz
}
fi # efi mode
}
12 changes: 0 additions & 12 deletions templates/boot/isolinux/addon_20_allinone.cfg

This file was deleted.

File renamed without changes.
9 changes: 0 additions & 9 deletions templates/boot/isolinux/addon_30_dos.cfg

This file was deleted.

2 changes: 1 addition & 1 deletion templates/boot/isolinux/f3
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
forensic do not touch any harddisks during hardware recognition
serial activate serial console
grub boot GRand Unified Bootloader (GRUB)
dos boot FreeDOS 1.0
hdt boot Hardware Detection Tool



A list with all supported boot options can be found on the CD at
/run/live/medium/grml/*/grml-cheatcodes.txt

Expand Down
5 changes: 1 addition & 4 deletions templates/boot/isolinux/isolinux.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,7 @@
#
# b = Back to main menu...
# 2 = Grub2
# 1 = Grub1
# a = All-in-One-Image
# x = GPXE
# f = FreeDOS
# x = iPXE
# m = Memtest86+
# t = Hardware Detection Tool
#
Expand Down

0 comments on commit 5871571

Please sign in to comment.