X-Git-Url: https://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=templates%2Fboot%2Fgrub%2Fgrub.cfg;h=a245fa770d321646805e682e60afafaf500766a3;hp=4602c1a8aa2aa617654980ef460a5df566fb6f2c;hb=d9346434d30304e524184dba98e3e17b35461bc0;hpb=247c1e253bc2e5ae05bf0b3899d7700b18d50631

diff --git a/templates/boot/grub/grub.cfg b/templates/boot/grub/grub.cfg
index 4602c1a..a245fa7 100644
--- a/templates/boot/grub/grub.cfg
+++ b/templates/boot/grub/grub.cfg
@@ -19,12 +19,12 @@ else
 fi
 
 menuentry "%GRML_NAME% - release %VERSION% (default)" {
-    linux   /boot/%GRML_NAME%/linux26 apm=power-off vga=791 quiet boot=live nomce 
-    initrd  /boot/%GRML_NAME%/initrd.gz
+    linux   /boot/%SHORT_NAME%/linux26 apm=power-off vga=791 quiet boot=live bootid=%BOOTID% bootfrom=removable nomce 
+    initrd  /boot/%SHORT_NAME%/initrd.gz
 }
 
 menuentry "Memory test (memtest86+)" {
-    linux   /boot/addons/memtest
+    linux16 /boot/addons/memtest
 }
 
 menuentry "Grub - all in one image" {
@@ -60,48 +60,48 @@ menuentry "Boot OS of first partition on first disk" {
 }
 
 menuentry "%GRML_NAME% - enable persistent mode" {
-    linux  /boot/%GRML_NAME%/linux26 apm=power-off boot=live nomce vga=791 quiet persistent 
-    initrd /boot/%GRML_NAME%/initrd.gz
+    linux  /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% bootfrom=removable nomce vga=791 quiet persistent 
+    initrd /boot/%SHORT_NAME%/initrd.gz
 }
 
 menuentry "%GRML_NAME% - copy grml to RAM" {
-    linux  /boot/%GRML_NAME%/linux26 apm=power-off boot=live nomce vga=791 quiet toram=%GRML_NAME%.squashfs 
-    initrd /boot/%GRML_NAME%/initrd.gz
+    linux  /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% bootfrom=removable nomce vga=791 quiet toram=%GRML_NAME%.squashfs 
+    initrd /boot/%SHORT_NAME%/initrd.gz
 }
 
 menuentry "%GRML_NAME% - copy whole medium to RAM" {
-    linux  /boot/%GRML_NAME%/linux26 apm=power-off boot=live nomce vga=791 quiet toram
-    initrd /boot/%GRML_NAME%/initrd.gz
+    linux  /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% bootfrom=removable nomce vga=791 quiet toram
+    initrd /boot/%SHORT_NAME%/initrd.gz
 }
 
 menuentry "%GRML_NAME% - start X by default" {
-    linux  /boot/%GRML_NAME%/linux26 apm=power-off boot=live nomce vga=791 quiet startx=wm-ng 
-    initrd /boot/%GRML_NAME%/initrd.gz
+    linux  /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% bootfrom=removable nomce vga=791 quiet startx=wm-ng 
+    initrd /boot/%SHORT_NAME%/initrd.gz
 }
 
 menuentry "%GRML_NAME% - disable framebuffer" {
-    linux  /boot/%GRML_NAME%/linux26 apm=power-off boot=live nomce quiet vga=normal video=ofonly 
-    initrd /boot/%GRML_NAME%/initrd.gz
+    linux  /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% bootfrom=removable nomce quiet vga=normal video=ofonly 
+    initrd /boot/%SHORT_NAME%/initrd.gz
 }
 
 menuentry "%GRML_NAME% - forensic mode" {
-    linux /boot/%GRML_NAME%/linux26 apm=power-off boot=live nomce vga=791 readonly quiet nofstab noraid nolvm noautoconfig noswap raid=noautodetect 
-    initrd /boot/%GRML_NAME%/initrd.gz
+    linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% bootfrom=removable nomce vga=791 readonly quiet nofstab noraid nolvm noautoconfig noswap raid=noautodetect 
+    initrd /boot/%SHORT_NAME%/initrd.gz
 }
 
 menuentry "%GRML_NAME% - failsafe mode" {
-    linux /boot/%GRML_NAME%/linux26 apm=power-off boot=live nomce quiet 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
+    linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% bootfrom=removable nomce quiet 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/%SHORT_NAME%/initrd.gz
 }
 
 menuentry "%GRML_NAME% - debug mode" {
-    linux /boot/%GRML_NAME%/linux26 apm=power-off boot=live nomce vga=791 debug boot=live initcall_debug
-    initrd /boot/%GRML_NAME%/initrd.gz
+    linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% bootfrom=removable nomce vga=791 debug boot=live initcall_debug
+    initrd /boot/%SHORT_NAME%/initrd.gz
 }
 
 menuentry "%GRML_NAME% - serial mode" {
-    linux /boot/%GRML_NAME%/linux26 apm=power-off boot=live nomce quiet vga=normal video=vesafb:off console=tty1 console=ttyS0,9600n8 
-    initrd /boot/%GRML_NAME%/initrd.gz
+    linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% bootfrom=removable nomce quiet vga=normal video=vesafb:off noquick console=tty1 console=ttyS0,9600n8 
+    initrd /boot/%SHORT_NAME%/initrd.gz
 }
 
 # EOF