X-Git-Url: http://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=templates%2Fboot%2Fisolinux%2Fsyslinux.cfg;fp=templates%2Fboot%2Fisolinux%2Fsyslinux.cfg;h=319604ff643d28566d36f4d54f556b80319ddf6e;hp=a17bf8c136a58d3e3621dfeeded326bb3dad6aa4;hb=d9346434d30304e524184dba98e3e17b35461bc0;hpb=2b047e098850eaf1fac91b2e0772fa3536cfe969

diff --git a/templates/boot/isolinux/syslinux.cfg b/templates/boot/isolinux/syslinux.cfg
index a17bf8c..319604f 100644
--- a/templates/boot/isolinux/syslinux.cfg
+++ b/templates/boot/isolinux/syslinux.cfg
@@ -28,62 +28,62 @@ LABEL grml
 MENU LABEL grml - Standard Bootup
 MENU DEFAULT
 KERNEL linux26
-APPEND apm=power-off vga=791 quiet initrd=initrd.gz boot=live nomce 
+APPEND apm=power-off vga=791 quiet initrd=initrd.gz boot=live bootid=%BOOTID% bootfrom=removable nomce 
 
 LABEL grml2ram
 MENU LABEL grml2ram - Copy Squashfs file to RAM
 KERNEL linux26
-APPEND apm=power-off toram=%SQUASHFS_NAME% vga=791 quiet initrd=initrd.gz boot=live nomce 
+APPEND apm=power-off toram=%SQUASHFS_NAME% vga=791 quiet initrd=initrd.gz boot=live bootid=%BOOTID% bootfrom=removable nomce 
 
 LABEL splash
 MENU LABEL grml - Bootsplash
 KERNEL linux26
-APPEND apm=power-off vga=791 quiet initrd=initrd.gz boot=live splash nomce 
+APPEND apm=power-off vga=791 quiet initrd=initrd.gz boot=live bootid=%BOOTID% bootfrom=removable splash nomce 
 
 LABEL grml2hd
 MENU LABEL grml2hd
 KERNEL linux26
-APPEND apm=power-off quiet initrd=initrd.gz boot=live nomce 
+APPEND apm=power-off quiet initrd=initrd.gz boot=live bootid=%BOOTID% bootfrom=removable nomce 
 
 LABEL debian2hd
 MENU LABEL debian2hd
 KERNEL linux26
-APPEND apm=power-off vga=791 initrd=initrd.gz boot=live BOOT_IMAGE=debian2hd nomce 
+APPEND apm=power-off vga=791 initrd=initrd.gz boot=live bootid=%BOOTID% bootfrom=removable BOOT_IMAGE=debian2hd nomce 
 
 LABEL debug
 MENU LABEL debug
 KERNEL linux26
-APPEND apm=power-off vga=791 verbose debug=vc debug initrd=initrd.gz boot=live initcall_debug nomce 
+APPEND apm=power-off vga=791 verbose debug=vc debug initrd=initrd.gz boot=live bootid=%BOOTID% bootfrom=removable initcall_debug nomce 
 
 LABEL bootchart
 MENU LABEL bootchart
 KERNEL linux26
-APPEND init=/sbin/bootchartd apm=power-off vga=791 quiet initrd=initrd.gz boot=live nomce 
+APPEND init=/sbin/bootchartd apm=power-off vga=791 quiet initrd=initrd.gz boot=live bootid=%BOOTID% bootfrom=removable nomce 
 
 LABEL vmware
 MENU LABEL vmware
 KERNEL linux26
-APPEND apm=power-off nousb nousb2 nofirewire vga=791 quiet initrd=initrd.gz boot=live nomce 
+APPEND apm=power-off nousb nousb2 nofirewire vga=791 quiet initrd=initrd.gz boot=live bootid=%BOOTID% bootfrom=removable nomce 
 
 LABEL qemu
 MENU LABEL qemu
 KERNEL linux26
-APPEND apm=power-off nousb nousb2 nofirewire vga=791 quiet initrd=initrd.gz boot=live nomce qemu 
+APPEND apm=power-off nousb nousb2 nofirewire vga=791 quiet initrd=initrd.gz boot=live bootid=%BOOTID% bootfrom=removable nomce qemu 
 
 LABEL grmlx
 MENU LABEL grmlx
 KERNEL linux26
-APPEND apm=power-off startx=wm-ng vga=791 quiet initrd=initrd.gz boot=live nomce 
+APPEND apm=power-off startx=wm-ng vga=791 quiet initrd=initrd.gz boot=live bootid=%BOOTID% bootfrom=removable nomce 
 
 LABEL nofb
 MENU LABEL grml without framebuffer
 KERNEL linux26
-APPEND apm=power-off vga=normal video=ofonly quiet initrd=initrd.gz boot=live nomce 
+APPEND apm=power-off vga=normal video=ofonly quiet initrd=initrd.gz boot=live bootid=%BOOTID% bootfrom=removable nomce 
 
 LABEL linux26
 MENU LABEL linux26
 KERNEL linux26
-APPEND apm=power-off vga=791 quiet initrd=initrd.gz boot=live nomce 
+APPEND apm=power-off vga=791 quiet initrd=initrd.gz boot=live bootid=%BOOTID% bootfrom=removable nomce 
 
 LABEL memtest
 MENU LABEL memtest
@@ -93,27 +93,27 @@ APPEND BOOT_IMAGE=memtest
 LABEL fb1280x1024
 MENU LABEL fb1280x1024
 KERNEL linux26
-APPEND apm=power-off vga=794 quiet initrd=initrd.gz boot=live nomce 
+APPEND apm=power-off vga=794 quiet initrd=initrd.gz boot=live bootid=%BOOTID% bootfrom=removable nomce 
 
 LABEL fb1024x768
 MENU LABEL fb1024x768
 KERNEL linux26
-APPEND apm=power-off vga=791 quiet initrd=initrd.gz boot=live nomce 
+APPEND apm=power-off vga=791 quiet initrd=initrd.gz boot=live bootid=%BOOTID% bootfrom=removable nomce 
 
 LABEL fb800x600
 MENU LABEL fb800x600
 KERNEL linux26
-APPEND apm=power-off vga=788 quiet initrd=initrd.gz boot=live nomce 
+APPEND apm=power-off vga=788 quiet initrd=initrd.gz boot=live bootid=%BOOTID% bootfrom=removable nomce 
 
 LABEL failsafe
 MENU LABEL failsafe
 KERNEL linux26
-APPEND initrd=initrd.gz 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 
+APPEND initrd=initrd.gz 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 
 
 LABEL forensic
 MENU LABEL forensic
 KERNEL linux26
-APPEND vga=791 forensic nofstab noraid nolvm noautoconfig noswap raid=noautodetect quiet initrd=initrd.gz boot=live 
+APPEND vga=791 forensic nofstab noraid nolvm noautoconfig noswap raid=noautodetect quiet initrd=initrd.gz boot=live bootid=%BOOTID% bootfrom=removable 
 
 LABEL grub2
 MENU LABEL GRUB2
@@ -147,7 +147,7 @@ APPEND pciids=/boot/addons/pci.ids
 LABEL serial
 MENU LABEL serial
 KERNEL linux26
-APPEND apm=power-off vga=normal video=vesafb:off quiet initrd=initrd.gz boot=live nomce noquick console=tty1 console=ttyS0,9600n8 
+APPEND 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 
 
 LABEL userdef
 MENU LABEL User defined