X-Git-Url: https://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=templates%2Fboot%2Fgrub%2Fmenu.lst;h=dcceeb2a4a269ae6cdeffc104cc639e36a752f56;hp=960225571baa7d845d9f1e080e816b15bf60a672;hb=9b9e3cb1d3db3d51ff0bf508782d0b4304b3ccd0;hpb=525d55cc32a2b76e93b87c424932c4b5d580020a

diff --git a/templates/boot/grub/menu.lst b/templates/boot/grub/menu.lst
index 9602255..dcceeb2 100644
--- a/templates/boot/grub/menu.lst
+++ b/templates/boot/grub/menu.lst
@@ -12,48 +12,48 @@ background  = FFCC33
 
 # define entries:
 title %GRML_NAME% %VERSION% - Default boot (using 1024x768 framebuffer)
-kernel /boot/%GRML_NAME%/linux26 apm=power-off lang=us vga=791 quiet boot=live nomce
-initrd /boot/%GRML_NAME%/initrd.gz
+kernel /boot/%SHORT_NAME%/linux26 apm=power-off vga=791 quiet boot=live bootid=%BOOTID% bootfrom=removable nomce 
+initrd /boot/%SHORT_NAME%/initrd.gz
 
 title %GRML_NAME% %VERSION% - without framebuffer
-kernel /boot/%GRML_NAME%/linux26 apm=power-off lang=us vga=normal video=ofonly quiet initrd=initrd.gz boot=live nomce
-initrd /boot/%GRML_NAME%/initrd.gz
+kernel /boot/%SHORT_NAME%/linux26 apm=power-off vga=normal video=ofonly quiet initrd=initrd.gz boot=live bootid=%BOOTID% bootfrom=removable nomce 
+initrd /boot/%SHORT_NAME%/initrd.gz
 
 title %GRML_NAME% %VERSION% - with 1280x1024 framebuffer
-kernel /boot/%GRML_NAME%/linux26 apm=power-off lang=us vga=794 quiet initrd=initrd.gz boot=live nomce
-initrd /boot/%GRML_NAME%/initrd.gz
+kernel /boot/%SHORT_NAME%/linux26 apm=power-off vga=794 quiet initrd=initrd.gz boot=live bootid=%BOOTID% bootfrom=removable nomce 
+initrd /boot/%SHORT_NAME%/initrd.gz
 
 title %GRML_NAME% %VERSION% - with 800x600 framebuffer
-kernel /boot/%GRML_NAME%/linux26 apm=power-off lang=us vga=788 quiet initrd=initrd.gz boot=live nomce
-initrd /boot/%GRML_NAME%/initrd.gz
+kernel /boot/%SHORT_NAME%/linux26 apm=power-off vga=788 quiet initrd=initrd.gz boot=live bootid=%BOOTID% bootfrom=removable nomce 
+initrd /boot/%SHORT_NAME%/initrd.gz
 
 title %GRML_NAME% %VERSION% - failsafe boot
-kernel /boot/%GRML_NAME%/linux26 vga=normal boot=live noautoconfig atapicd noapic noacpi acpi=off nomodules nofirewire noudev nousb nohotplug noapm nopcmcia nosmp maxcpus=0 noscsi noagp nodma ide=nodma noswap nofstab nosound nogpm nosyslog nodhcp nocpu nodisc nomodem xmodule=vesa noraid nolvm noresume selinux=0 edd=off
-initrd /boot/%GRML_NAME%/initrd.gz
+kernel /boot/%SHORT_NAME%/linux26 vga=normal boot=live bootid=%BOOTID% bootfrom=removable noautoconfig atapicd noapic noacpi acpi=off nomodules nofirewire noudev nousb nohotplug noapm nopcmcia nosmp maxcpus=0 noscsi noagp nodma ide=nodma noswap nofstab nosound nogpm nosyslog nodhcp nocpu nodisc nomodem xmodule=vesa noraid nolvm noresume selinux=0 edd=off 
+initrd /boot/%SHORT_NAME%/initrd.gz
 
 title %GRML_NAME% %VERSION% - debug mode
-kernel /boot/%GRML_NAME%/linux26 apm=power-off lang=us vga=791 verbose debug=vc debug initrd=initrd.gz boot=live initcall_debug nomce
-initrd /boot/%GRML_NAME%/initrd.gz
+kernel /boot/%SHORT_NAME%/linux26 apm=power-off vga=791 verbose debug=vc initrd=initrd.gz boot=live bootid=%BOOTID% bootfrom=removable initcall_debug nomce 
+initrd /boot/%SHORT_NAME%/initrd.gz
 
 title %GRML_NAME% %VERSION% - copy grml squashfs file to RAM
-kernel /boot/%GRML_NAME%/linux26 toram=grml.squashfs apm=power-off lang=us vga=791 quiet boot=live nomce
-initrd /boot/%GRML_NAME%/initrd.gz
+kernel /boot/%SHORT_NAME%/linux26 toram=%GRML_NAME_SQUASHFS% apm=power-off vga=791 quiet boot=live bootid=%BOOTID% bootfrom=removable nomce 
+initrd /boot/%SHORT_NAME%/initrd.gz
 
 title %GRML_NAME% %VERSION% - copy medium to RAM
-kernel /boot/%GRML_NAME%/linux26 toram apm=power-off lang=us vga=791 quiet boot=live nomce
-initrd /boot/%GRML_NAME%/initrd.gz
+kernel /boot/%SHORT_NAME%/linux26 toram apm=power-off vga=791 quiet boot=live bootid=%BOOTID% bootfrom=removable nomce 
+initrd /boot/%SHORT_NAME%/initrd.gz
 
 title %GRML_NAME% %VERSION% - grml2hd - install grml to local harddisk [adjust it!]
-kernel /boot/%GRML_NAME%/linux26 apm=power-off lang=us vga=791 quiet boot=live nomce partition=/dev/ice1 mbr=/dev/ice
-initrd /boot/%GRML_NAME%/initrd.gz
+kernel /boot/%SHORT_NAME%/linux26 apm=power-off vga=791 quiet boot=live bootid=%BOOTID% bootfrom=removable nomce partition=/dev/ice1 mbr=/dev/ice
+initrd /boot/%SHORT_NAME%/initrd.gz
 
 title %GRML_NAME% %VERSION% - forensic mode
-kernel /boot/%GRML_NAME%/linux26 vga=791 lang=us nofstab noraid nolvm noautoconfig noswap raid=noautodetect quiet initrd=initrd.gz boot=live
-initrd /boot/%GRML_NAME%/initrd.gz
+kernel /boot/%SHORT_NAME%/linux26 vga=791 nofstab noraid nolvm noautoconfig noswap raid=noautodetect quiet initrd=initrd.gz boot=live bootid=%BOOTID% bootfrom=removable 
+initrd /boot/%SHORT_NAME%/initrd.gz
 
 title %GRML_NAME% %VERSION% - serial console mode
-kernel /boot/%GRML_NAME%/linux26 apm=power-off lang=us vga=normal video=vesafb:off quiet initrd=initrd.gz boot=live nomce console=tty1 console=ttyS0,9600n8
-initrd /boot/%GRML_NAME%/initrd.gz
+kernel /boot/%SHORT_NAME%/linux26 apm=power-off vga=normal video=vesafb:off quiet initrd=initrd.gz boot=live bootid=%BOOTID% bootfrom=removable nomce noquick console=tty1 console=ttyS0,9600n8 
+initrd /boot/%SHORT_NAME%/initrd.gz
 
 title Run memtest86+
 kernel /boot/addons/memtest
@@ -62,9 +62,19 @@ title Boot FreeDOS
 kernel /boot/addons/memdisk
 initrd /boot/addons/balder10.imz
 
-title MirBSD
+title MirOS bsd4grml (regular method)
 kernel /boot/addons/bsd4grml/ldbsd.com
 
-# title %GRML_NAME% %VERSION% - old boot method
-# kernel /boot/%GRML_NAME%/linux26 ramdisk_size=100000 init=/etc/init apm=power-off lang=us vga=791 nomce quiet grml_dir="live" grml_name="grml.squashfs"
-# initrd /boot/%GRML_NAME%/minirt26.gz
+title MirOS bsd4grml (fallback method)
+kernel /boot/addons/bsd4grml/ldbsd.com
+modulenounzip /boot/addons/bsd4grml/bsd.rd
+module /boot/addons/bsd4grml/boot.1
+module /boot/addons/bsd4grml/boot.2
+module /boot/addons/bsd4grml/boot.3
+module /boot/addons/bsd4grml/boot.4
+module /boot/addons/bsd4grml/boot.5
+module /boot/addons/bsd4grml/boot.6
+module /boot/addons/bsd4grml/boot.cfg
+module /boot/grub/%GRUB_LEGACY%
+module /boot/grub/core.img
+