From: Michael Prokop <mika@grml.org>
Date: Thu, 11 Mar 2010 11:19:08 +0000 (+0100)
Subject: Drop bootfrom=removable from bootoptions.
X-Git-Tag: v0.9.39~2
X-Git-Url: https://git.grml.org/?p=grml-live.git;a=commitdiff_plain;h=829bcb9166e4ede590b4294106376af22314b739

Drop bootfrom=removable from bootoptions.
---

diff --git a/templates/boot/grub/grub.cfg b/templates/boot/grub/grub.cfg
index 1bf5c8e..2f3dc4c 100644
--- a/templates/boot/grub/grub.cfg
+++ b/templates/boot/grub/grub.cfg
@@ -19,7 +19,7 @@ else
 fi
 
 menuentry "%GRML_NAME% - release %VERSION% (default)" {
-    linux   /boot/%SHORT_NAME%/linux26 apm=power-off vga=791 quiet boot=live bootid=%BOOTID% bootfrom=removable nomce 
+    linux   /boot/%SHORT_NAME%/linux26 apm=power-off vga=791 quiet boot=live bootid=%BOOTID% nomce 
     initrd  /boot/%SHORT_NAME%/initrd.gz
 }
 
@@ -64,47 +64,47 @@ menuentry "Boot OS of first partition on first disk" {
 }
 
 menuentry "%GRML_NAME% - enable persistent mode" {
-    linux  /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% bootfrom=removable nomce vga=791 quiet persistent 
+    linux  /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce vga=791 quiet persistent 
     initrd /boot/%SHORT_NAME%/initrd.gz
 }
 
 menuentry "%GRML_NAME% - copy grml to RAM" {
-    linux  /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% bootfrom=removable nomce vga=791 quiet toram=%GRML_NAME%.squashfs 
+    linux  /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce vga=791 quiet toram=%GRML_NAME%.squashfs 
     initrd /boot/%SHORT_NAME%/initrd.gz
 }
 
 menuentry "%GRML_NAME% - copy whole medium to RAM" {
-    linux  /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% bootfrom=removable nomce vga=791 quiet toram
+    linux  /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce vga=791 quiet toram
     initrd /boot/%SHORT_NAME%/initrd.gz
 }
 
 menuentry "%GRML_NAME% - start X by default" {
-    linux  /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% bootfrom=removable nomce vga=791 quiet startx=wm-ng 
+    linux  /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce vga=791 quiet startx=wm-ng 
     initrd /boot/%SHORT_NAME%/initrd.gz
 }
 
 menuentry "%GRML_NAME% - disable framebuffer" {
-    linux  /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% bootfrom=removable nomce quiet vga=normal video=ofonly 
+    linux  /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce quiet vga=normal video=ofonly 
     initrd /boot/%SHORT_NAME%/initrd.gz
 }
 
 menuentry "%GRML_NAME% - forensic mode" {
-    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 
+    linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% 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/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% bootfrom=removable nomce quiet vga=normal 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 
+    linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce quiet vga=normal 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/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% bootfrom=removable nomce vga=791 initcall verbose debug=vc
+    linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce vga=791 initcall verbose debug=vc
     initrd /boot/%SHORT_NAME%/initrd.gz
 }
 
 menuentry "%GRML_NAME% - serial mode" {
-    linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% bootfrom=removable nomce quiet vga=normal video=vesafb:off console=tty1 console=ttyS0,9600n8 
+    linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce quiet vga=normal video=vesafb:off console=tty1 console=ttyS0,9600n8 
     initrd /boot/%SHORT_NAME%/initrd.gz
 }
 
diff --git a/templates/boot/grub/menu.lst b/templates/boot/grub/menu.lst
index 15f7aa8..15facd9 100644
--- a/templates/boot/grub/menu.lst
+++ b/templates/boot/grub/menu.lst
@@ -12,47 +12,47 @@ background  = FFCC33
 
 # define entries:
 title %GRML_NAME% %VERSION% - Default boot (using 1024x768 framebuffer)
-kernel /boot/%SHORT_NAME%/linux26 apm=power-off vga=791 quiet boot=live bootid=%BOOTID% bootfrom=removable nomce 
+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/%SHORT_NAME%/linux26 apm=power-off vga=normal video=ofonly quiet initrd=initrd.gz boot=live bootid=%BOOTID% bootfrom=removable nomce 
+kernel /boot/%SHORT_NAME%/linux26 apm=power-off vga=normal video=ofonly quiet initrd=initrd.gz boot=live bootid=%BOOTID% nomce 
 initrd /boot/%SHORT_NAME%/initrd.gz
 
 title %GRML_NAME% %VERSION% - with 1280x1024 framebuffer
-kernel /boot/%SHORT_NAME%/linux26 apm=power-off vga=794 quiet initrd=initrd.gz boot=live bootid=%BOOTID% bootfrom=removable nomce 
+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/%SHORT_NAME%/linux26 apm=power-off vga=788 quiet initrd=initrd.gz boot=live bootid=%BOOTID% bootfrom=removable nomce 
+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/%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 
+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 nolvm noresume selinux=0 edd=off 
 initrd /boot/%SHORT_NAME%/initrd.gz
 
 title %GRML_NAME% %VERSION% - debug mode
-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 
+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/%SHORT_NAME%/linux26 toram=%GRML_NAME_SQUASHFS% apm=power-off vga=791 quiet boot=live bootid=%BOOTID% bootfrom=removable nomce 
+kernel /boot/%SHORT_NAME%/linux26 toram=%GRML_NAME_SQUASHFS% 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/%SHORT_NAME%/linux26 toram apm=power-off vga=791 quiet boot=live bootid=%BOOTID% bootfrom=removable nomce 
+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/%SHORT_NAME%/linux26 apm=power-off vga=791 quiet boot=live bootid=%BOOTID% bootfrom=removable nomce partition=/dev/ice1 mbr=/dev/ice
+kernel /boot/%SHORT_NAME%/linux26 apm=power-off vga=791 quiet boot=live bootid=%BOOTID% nomce partition=/dev/ice1 mbr=/dev/ice
 initrd /boot/%SHORT_NAME%/initrd.gz
 
 title %GRML_NAME% %VERSION% - forensic mode
-kernel /boot/%SHORT_NAME%/linux26 vga=791 nofstab noraid nolvm noautoconfig noswap raid=noautodetect quiet initrd=initrd.gz boot=live bootid=%BOOTID% bootfrom=removable 
+kernel /boot/%SHORT_NAME%/linux26 vga=791 nofstab noraid 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/%SHORT_NAME%/linux26 apm=power-off vga=normal video=vesafb:off quiet initrd=initrd.gz boot=live bootid=%BOOTID% bootfrom=removable nomce console=tty1 console=ttyS0,9600n8 
+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+
diff --git a/templates/boot/isolinux/default.cfg b/templates/boot/isolinux/default.cfg
index 1256cdf..9e032a3 100644
--- a/templates/boot/isolinux/default.cfg
+++ b/templates/boot/isolinux/default.cfg
@@ -3,7 +3,7 @@ label grml
   menu DEFAULT
   menu label %GRML_NAME% ^Standard (%VERSION%, %ARCH%)
   kernel /boot/%SHORT_NAME%/linux26
-  append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% bootfrom=removable apm=power-off vga=791 quiet nomce 
+  append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce 
 
   text help
                                         Grml is a Debian based Linux live
diff --git a/templates/boot/isolinux/grml.cfg b/templates/boot/isolinux/grml.cfg
index 82ef3c7..e0ee186 100644
--- a/templates/boot/isolinux/grml.cfg
+++ b/templates/boot/isolinux/grml.cfg
@@ -5,7 +5,7 @@
 label debug
   menu label %GRML_NAME% - ^Debug Mode
   kernel /boot/%SHORT_NAME%/linux26
-  append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% bootfrom=removable apm=power-off vga=791 verbose debug=vc initcall nomce 
+  append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off vga=791 verbose debug=vc initcall nomce 
 
   text help
                                         Boot Grml in debug mode, which
@@ -16,7 +16,7 @@ label debug
 label nofb
   menu label %GRML_NAME% - Dis^able Framebuffer
   kernel /boot/%SHORT_NAME%/linux26
-  append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% bootfrom=removable apm=power-off vga=normal quiet nomce 
+  append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off vga=normal quiet nomce 
 
   text help
                                         Boot Grml without framebuffer.
@@ -25,7 +25,7 @@ label nofb
 label ssh
   menu label %GRML_NAME% - Enable ^SSH (with random password)
   kernel /boot/%SHORT_NAME%/linux26
-  append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% bootfrom=removable apm=power-off vga=791 quiet nomce ssh
+  append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce ssh
 
   text help
                                         Boot Grml and automatically start
@@ -39,7 +39,7 @@ label ssh
 label failsafe
   menu label %GRML_NAME% - ^Failsafe Mode
   kernel /boot/%SHORT_NAME%/linux26
-  append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% logo.nologo=1 distri=grml-forensic bootfrom=removable readonly apm=power-off nomce vga=normal noautoconfig noapic noacpi acpi=off noudev noapm agp=off nosmp maxcpus=0 libata.dma=0 nofstab nomodules nosound nogpm nosyslog nocpu nodisc nomodem xmodule=vesa noresume selinux=0 edd=off pci=nomsi noraid nolvm noswap raid=noautodetect nodhcp 
+  append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% logo.nologo=1 distri=grml-forensic readonly apm=power-off nomce vga=normal noautoconfig noapic noacpi acpi=off noudev noapm agp=off nosmp maxcpus=0 libata.dma=0 nofstab nomodules nosound nogpm nosyslog nocpu nodisc nomodem xmodule=vesa noresume selinux=0 edd=off pci=nomsi noraid nolvm noswap raid=noautodetect nodhcp 
   text help
                                         Boot Grml in failsafe mode, which
                                         disables any hardware recognition
@@ -51,7 +51,7 @@ label failsafe
 label forensic
   menu label %GRML_NAME% - F^orensic Mode
   kernel /boot/%SHORT_NAME%/linux26
-  append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% bootfrom=removable apm=power-off nomce vga=791 forensic nofstab noraid nolvm noautoconfig noswap raid=noautodetect readonly quiet 
+  append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off nomce vga=791 forensic nofstab noraid nolvm noautoconfig noswap raid=noautodetect readonly quiet 
 
   text help
                                         Boot Grml in forensic mode. This
@@ -64,7 +64,7 @@ label forensic
 label lang-de
   menu label %GRML_NAME% - ^German Settings
   kernel /boot/%SHORT_NAME%/linux26
-  append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% bootfrom=removable apm=power-off vga=791 quiet nomce lang=de 
+  append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce lang=de 
 
   text help
                                         Boot Grml with german settings.
@@ -73,7 +73,7 @@ label lang-de
 label %GRML_NAME%x
   menu label %GRML_NAME% - Graphical ^Mode
   kernel /boot/%SHORT_NAME%/linux26
-  append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% bootfrom=removable apm=power-off quiet nomce startx=wm-ng 
+  append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off quiet nomce startx=wm-ng 
 
   text help
                                         Boot Grml and automatically invoke
@@ -83,7 +83,7 @@ label %GRML_NAME%x
 label grml2ram
   menu label %GRML_NAME% - Load to ^RAM
   kernel /boot/%SHORT_NAME%/linux26
-  append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% bootfrom=removable apm=power-off vga=791 quiet nomce toram=%SQUASHFS_NAME% 
+  append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce toram=%SQUASHFS_NAME% 
 
   text help
                                         Load Grml into the memory (RAM).
@@ -98,7 +98,7 @@ label grml2ram
 label persistent
   menu label %GRML_NAME% - ^Persistent mode
   kernel /boot/%SHORT_NAME%/linux26
-  append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% bootfrom=removable apm=power-off vga=791 quiet nomce persistent 
+  append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce persistent 
 
   text help
 					Boot Grml and enable persistency
@@ -110,7 +110,7 @@ label persistent
 label serial
   menu label %GRML_NAME% - Serial ^Console
   kernel /boot/%SHORT_NAME%/linux26
-  append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% bootfrom=removable apm=power-off vga=normal video=vesafb:off quiet nomce console=tty1 console=ttyS0,9600n8 
+  append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off vga=normal video=vesafb:off quiet nomce console=tty1 console=ttyS0,9600n8 
 
 
   text help
diff --git a/templates/boot/isolinux/hidden.cfg b/templates/boot/isolinux/hidden.cfg
index 436d7eb..26a35c4 100644
--- a/templates/boot/isolinux/hidden.cfg
+++ b/templates/boot/isolinux/hidden.cfg
@@ -1,52 +1,52 @@
 label splash
 menu hide
 kernel /boot/%SHORT_NAME%/linux26
-append apm=power-off vga=791 quiet initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% bootfrom=removable splash nomce 
+append apm=power-off vga=791 quiet initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% splash nomce 
 
 label grml2hd
 menu hide
 kernel /boot/%SHORT_NAME%/linux26
-append apm=power-off quiet initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% bootfrom=removable nomce 
+append apm=power-off quiet initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% nomce 
 
 label debian2hd
 menu hide
 kernel /boot/%SHORT_NAME%/linux26
-append apm=power-off vga=791 initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% bootfrom=removable BOOT_IMAGE=debian2hd nomce 
+append apm=power-off vga=791 initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% BOOT_IMAGE=debian2hd nomce 
 
 label debug
 menu hide
 kernel /boot/%SHORT_NAME%/linux26
-append apm=power-off vga=791 verbose debug=vc initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% bootfrom=removable initcall_debug nomce 
+append apm=power-off vga=791 verbose debug=vc initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% initcall_debug nomce 
 
 label bootchart
 menu hide
 kernel /boot/%SHORT_NAME%/linux26
-append init=/sbin/bootchartd apm=power-off vga=791 quiet initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% bootfrom=removable nomce 
+append init=/sbin/bootchartd apm=power-off vga=791 quiet initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% nomce 
 
 label vmware
 menu hide
 kernel /boot/%SHORT_NAME%/linux26
-append apm=power-off nousb nousb2 nofirewire vga=791 quiet initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% bootfrom=removable nomce 
+append apm=power-off nousb nousb2 nofirewire vga=791 quiet initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% nomce 
 
 label qemu
 menu hide
 kernel /boot/%SHORT_NAME%/linux26
-append apm=power-off nousb nousb2 nofirewire vga=791 quiet initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% bootfrom=removable nomce qemu 
+append apm=power-off nousb nousb2 nofirewire vga=791 quiet initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% nomce qemu 
 
 label grmlx
 menu hide
 kernel /boot/%SHORT_NAME%/linux26
-append apm=power-off startx=wm-ng vga=791 quiet initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% bootfrom=removable nomce 
+append apm=power-off startx=wm-ng vga=791 quiet initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% nomce 
 
 label nofb
 menu hide
 kernel /boot/%SHORT_NAME%/linux26
-append apm=power-off vga=normal video=ofonly quiet initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% bootfrom=removable nomce 
+append apm=power-off vga=normal video=ofonly quiet initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% nomce 
 
 label linux26
 menu hide
 kernel /boot/%SHORT_NAME%/linux26
-append apm=power-off vga=791 quiet initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% bootfrom=removable nomce 
+append apm=power-off vga=791 quiet initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% nomce 
 
 label memtest
 menu hide
@@ -56,22 +56,22 @@ append BOOT_IMAGE=memtest
 label fb1280x1024
 menu hide
 kernel /boot/%SHORT_NAME%/linux26
-append apm=power-off vga=794 quiet initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% bootfrom=removable nomce 
+append apm=power-off vga=794 quiet initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% nomce 
 
 label fb1024x768
 menu hide
 kernel /boot/%SHORT_NAME%/linux26
-append apm=power-off vga=791 quiet initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% bootfrom=removable nomce 
+append apm=power-off vga=791 quiet initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% nomce 
 
 label fb800x600
 menu hide
 kernel /boot/%SHORT_NAME%/linux26
-append apm=power-off vga=788 quiet initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% bootfrom=removable nomce 
+append apm=power-off vga=788 quiet initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% nomce 
 
 label serial
 menu hide
 kernel /boot/%SHORT_NAME%/linux26
-append apm=power-off vga=normal video=vesafb:off quiet initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% bootfrom=removable nomce console=tty1 console=ttyS0,9600n8 
+append apm=power-off vga=normal video=vesafb:off quiet initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% nomce console=tty1 console=ttyS0,9600n8 
 
 label userdef
 menu hide