X-Git-Url: https://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=templates%2Fboot%2Fgrub%2Fmenu.lst;h=11d58d8920e18b4c67a00a2409fcc9cab6c51070;hp=e38f170c339b4fa518d28919e7cbb46b36d7818f;hb=739beb89c09d24c754a61cbb50a97983bb51cc34;hpb=93c0695a2d628b422b50b3efe232bf48adc2b05b

diff --git a/templates/boot/grub/menu.lst b/templates/boot/grub/menu.lst
index e38f170..11d58d8 100644
--- a/templates/boot/grub/menu.lst
+++ b/templates/boot/grub/menu.lst
@@ -5,7 +5,6 @@
 
 # misc options:
 timeout 30
-root (cd)
 # color red/blue green/black
 splashimage=/boot/grub/splash.xpm.gz
 foreground  = 000000
@@ -13,48 +12,52 @@ background  = FFCC33
 
 # define entries:
 title %GRML_NAME% %VERSION% - Default boot (using 1024x768 framebuffer)
-kernel /boot/grml/linux26 apm=power-off lang=us vga=791 quiet boot=live nomce
-initrd /boot/grml/initrd.gz
+kernel /boot/%SHORT_NAME%/linux26 apm=power-off vga=791 quiet boot=live bootid=%BOOTID% nomce 
+initrd /boot/%SHORT_NAME%/initrd.gz
 
-title %GRML_NAME% %VERSION% - without framebuffer
-kernel /boot/grml/linux26 apm=power-off lang=us vga=normal video=ofonly quiet initrd=initrd.gz boot=live nomce
-initrd /boot/grml/initrd.gz
+title %GRML_NAME% %VERSION% - disable framebuffer
+kernel /boot/%SHORT_NAME%/linux26 apm=power-off vga=normal video=ofonly quiet initrd=initrd.gz boot=live bootid=%BOOTID% nomce radeon.modeset=0 i915.modeset=0 nouveau.modeset=0 nomodeset 
+initrd /boot/%SHORT_NAME%/initrd.gz
+
+title %GRML_NAME% %VERSION% - disable Kernel Mode Setting
+kernel /boot/%SHORT_NAME%/linux26 apm=power-off quiet initrd=initrd.gz boot=live bootid=%BOOTID% nomce radeon.modeset=0 i915.modeset=0 nouveau.modeset=0 nomodeset vga=791 
+initrd /boot/%SHORT_NAME%/initrd.gz
 
 title %GRML_NAME% %VERSION% - with 1280x1024 framebuffer
-kernel /boot/grml/linux26 apm=power-off lang=us vga=794 quiet initrd=initrd.gz boot=live nomce
-initrd /boot/grml/initrd.gz
+kernel /boot/%SHORT_NAME%/linux26 apm=power-off vga=794 quiet initrd=initrd.gz boot=live bootid=%BOOTID% nomce 
+initrd /boot/%SHORT_NAME%/initrd.gz
 
 title %GRML_NAME% %VERSION% - with 800x600 framebuffer
-kernel /boot/grml/linux26 apm=power-off lang=us vga=788 quiet initrd=initrd.gz boot=live nomce
-initrd /boot/grml/initrd.gz
+kernel /boot/%SHORT_NAME%/linux26 apm=power-off vga=788 quiet initrd=initrd.gz boot=live bootid=%BOOTID% nomce 
+initrd /boot/%SHORT_NAME%/initrd.gz
 
 title %GRML_NAME% %VERSION% - failsafe boot
-kernel /boot/grml/linux26 vga=normal lang=us boot=live noautoconfig atapicd noacpi acpi=off nomodules nofirewire noudev nousb nohotplug noapm nopcmcia maxcpus=1 noscsi noagp nodma ide=nodma noswap nofstab nosound nogpm nosyslog nodhcp nocpu nodisc nomodem xmodule=vesa noraid nolvm
-initrd /boot/grml/initrd.gz
+kernel /boot/%SHORT_NAME%/linux26 vga=normal boot=live bootid=%BOOTID% 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 nodmraid nolvm noresume selinux=0 edd=off 
+initrd /boot/%SHORT_NAME%/initrd.gz
 
 title %GRML_NAME% %VERSION% - debug mode
-kernel /boot/grml/linux26 apm=power-off lang=us vga=791 verbose debug=vc debug initrd=initrd.gz boot=live initcall_debug nomce
-initrd /boot/grml/initrd.gz
+kernel /boot/%SHORT_NAME%/linux26 apm=power-off vga=791 verbose debug=vc initrd=initrd.gz boot=live bootid=%BOOTID% initcall_debug nomce 
+initrd /boot/%SHORT_NAME%/initrd.gz
 
 title %GRML_NAME% %VERSION% - copy grml squashfs file to RAM
-kernel /boot/grml/linux26 toram=grml.squashfs apm=power-off lang=us vga=791 quiet boot=live nomce
-initrd /boot/grml/initrd.gz
+kernel /boot/%SHORT_NAME%/linux26 toram=%SQUASHFS_NAME% apm=power-off vga=791 quiet boot=live bootid=%BOOTID% nomce 
+initrd /boot/%SHORT_NAME%/initrd.gz
 
 title %GRML_NAME% %VERSION% - copy medium to RAM
-kernel /boot/grml/linux26 toram apm=power-off lang=us vga=791 quiet boot=live nomce
-initrd /boot/grml/initrd.gz
+kernel /boot/%SHORT_NAME%/linux26 toram apm=power-off vga=791 quiet boot=live bootid=%BOOTID% nomce 
+initrd /boot/%SHORT_NAME%/initrd.gz
 
 title %GRML_NAME% %VERSION% - grml2hd - install grml to local harddisk [adjust it!]
-kernel /boot/grml/linux26 apm=power-off lang=us vga=791 quiet boot=live nomce partition=/dev/ice1 mbr=/dev/ice
-initrd /boot/grml/initrd.gz
+kernel /boot/%SHORT_NAME%/linux26 apm=power-off vga=791 quiet boot=live bootid=%BOOTID% nomce BOOT_IMAGE=grml2hd grml2hd partition=/dev/ice1 mbr=/dev/ice user=grml filesystem=ext3
+initrd /boot/%SHORT_NAME%/initrd.gz
 
 title %GRML_NAME% %VERSION% - forensic mode
-kernel /boot/grml/linux26 vga=791 lang=us nofstab noraid nolvm noautoconfig noswap raid=noautodetect quiet initrd=initrd.gz boot=live
-initrd /boot/grml/initrd.gz
+kernel /boot/%SHORT_NAME%/linux26 vga=791 nofstab noraid nodmraid nolvm noautoconfig noswap raid=noautodetect quiet initrd=initrd.gz boot=live bootid=%BOOTID% 
+initrd /boot/%SHORT_NAME%/initrd.gz
 
 title %GRML_NAME% %VERSION% - serial console mode
-kernel /boot/grml/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/initrd.gz
+kernel /boot/%SHORT_NAME%/linux26 apm=power-off vga=normal video=vesafb:off quiet initrd=initrd.gz boot=live bootid=%BOOTID% nomce console=tty1 console=ttyS0,9600n8 
+initrd /boot/%SHORT_NAME%/initrd.gz
 
 title Run memtest86+
 kernel /boot/addons/memtest
@@ -63,6 +66,19 @@ title Boot FreeDOS
 kernel /boot/addons/memdisk
 initrd /boot/addons/balder10.imz
 
-# title %GRML_NAME% %VERSION% - old boot method
-# kernel /boot/grml/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/minirt26.gz
+title MirOS bsd4grml (regular method)
+kernel /boot/addons/bsd4grml/ldbsd.com
+
+title MirOS bsd4grml (fallback method)
+kernel /boot/addons/bsd4grml/ldbsd.com
+modulenounzip /boot/addons/bsd4grml/bsd.rd bsd.rd
+module /boot/addons/bsd4grml/boot.1 boot.1
+module /boot/addons/bsd4grml/boot.2 boot.2
+module /boot/addons/bsd4grml/boot.3 boot.3
+module /boot/addons/bsd4grml/boot.4 boot.4
+module /boot/addons/bsd4grml/boot.5 boot.5
+module /boot/addons/bsd4grml/boot.6 boot.6
+module /boot/addons/bsd4grml/boot.cfg boot.cfg
+modulenounzip /boot/grub/%GRUB_LEGACY% %GRUB_LEGACY%
+modulenounzip /boot/grub/core.img core.img
+