Switch order of lang/apm bootoption

diff --git a/debian/changelog b/debian/changelog
index 0970deb..a307084 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,9 @@ grml-live (0.0.10) unstable; urgency=low
   * Do not create /etc/sysconfig/network-scripts and
     /etc/sysconfig/provider any longer in cleanup script.
   * Fix typo in bootsplash f3 (thanks, jimmy).
   * Do not create /etc/sysconfig/network-scripts and
     /etc/sysconfig/provider any longer in cleanup script.
   * Fix typo in bootsplash f3 (thanks, jimmy).

+  * Switch order of 'lang=us apm=power-off' to 'apm=poweroff' in
+    isolinyx/syslinux/grub configuration because getbootparam
+    of grml-autoconfig requires a whitespace inside /proc/cmdline.

 
  -- Michael Prokop <mika@grml.org>  Mon, 19 Nov 2007 12:49:37 +0100
 
 
  -- Michael Prokop <mika@grml.org>  Mon, 19 Nov 2007 12:49:37 +0100
 

diff --git a/templates/boot/grub/menu.lst b/templates/boot/grub/menu.lst
index 108d087..3fee5d6 100644 (file)
--- a/templates/boot/grub/menu.lst
+++ b/templates/boot/grub/menu.lst
@@ -13,19 +13,19 @@ background  = FFCC33
 
 # define entries:
 title %GRML_NAME% %VERSION% - Default boot (using 1024x768 framebuffer)
 
 # define entries:
 title %GRML_NAME% %VERSION% - Default boot (using 1024x768 framebuffer)

-kernel /boot/isolinux/linux26 lang=us apm=power-off vga=791 quiet boot=live nomce
+kernel /boot/isolinux/linux26 apm=power-off lang=us vga=791 quiet boot=live nomce

 initrd /boot/isolinux/initrd.gz
 
 title %GRML_NAME% %VERSION% - without framebuffer
 initrd /boot/isolinux/initrd.gz
 
 title %GRML_NAME% %VERSION% - without framebuffer

-kernel /boot/isolinux/linux26 lang=us apm=power-off vga=normal video=ofonly quiet initrd=initrd.gz boot=live nomce
+kernel /boot/isolinux/linux26 apm=power-off lang=us vga=normal video=ofonly quiet initrd=initrd.gz boot=live nomce

 initrd /boot/isolinux/initrd.gz
 
 title %GRML_NAME% %VERSION% - with 1280x1024 framebuffer
 initrd /boot/isolinux/initrd.gz
 
 title %GRML_NAME% %VERSION% - with 1280x1024 framebuffer

-kernel /boot/isolinux/linux26 lang=us apm=power-off vga=794 quiet initrd=initrd.gz boot=live nomce
+kernel /boot/isolinux/linux26 apm=power-off lang=us vga=794 quiet initrd=initrd.gz boot=live nomce

 initrd /boot/isolinux/initrd.gz
 
 title %GRML_NAME% %VERSION% - with 800x600 framebuffer
 initrd /boot/isolinux/initrd.gz
 
 title %GRML_NAME% %VERSION% - with 800x600 framebuffer

-kernel /boot/isolinux/linux26 lang=us apm=power-off vga=788 quiet initrd=initrd.gz boot=live nomce
+kernel /boot/isolinux/linux26 apm=power-off lang=us vga=788 quiet initrd=initrd.gz boot=live nomce

 initrd /boot/isolinux/initrd.gz
 
 title %GRML_NAME% %VERSION% - failsafe boot
 initrd /boot/isolinux/initrd.gz
 
 title %GRML_NAME% %VERSION% - failsafe boot


@@ -33,7 +33,7 @@ kernel /boot/isolinux/linux26 vga=normal lang=us boot=live noautoconfig atapicd
 initrd /boot/isolinux/initrd.gz
 
 title %GRML_NAME% %VERSION% - debug mode
 initrd /boot/isolinux/initrd.gz
 
 title %GRML_NAME% %VERSION% - debug mode

-kernel /boot/isolinux/linux26 lang=us apm=power-off vga=791 verbose debug=vc debug initrd=initrd.gz boot=live initcall_debug nomce
+kernel /boot/isolinux/linux26 apm=power-off lang=us vga=791 verbose debug=vc debug initrd=initrd.gz boot=live initcall_debug nomce

 initrd /boot/isolinux/initrd.gz
 
 title %GRML_NAME% %VERSION% - forensic mode
 initrd /boot/isolinux/initrd.gz
 
 title %GRML_NAME% %VERSION% - forensic mode


@@ -41,7 +41,7 @@ kernel /boot/isolinux/linux26 vga=791 lang=us nofstab noraid nolvm noautoconfig
 initrd /boot/isolinux/initrd.gz
 
 title %GRML_NAME% %VERSION% - serial mode
 initrd /boot/isolinux/initrd.gz
 
 title %GRML_NAME% %VERSION% - serial mode

-kernel /boot/isolinux/linux26 lang=us apm=power-off vga=normal video=vesafb:off quiet initrd=initrd.gz boot=live nomce
+kernel /boot/isolinux/linux26 apm=power-off lang=us vga=normal video=vesafb:off quiet initrd=initrd.gz boot=live nomce

 initrd /boot/isolinux/initrd.gz
 
 title Run memtest86+
 initrd /boot/isolinux/initrd.gz
 
 title Run memtest86+


@@ -52,5 +52,5 @@ kernel /boot/isolinux/memdisk
 initrd /boot/isolinux/balder10.imz
 
 # title %GRML_NAME% %VERSION% - old boot method
 initrd /boot/isolinux/balder10.imz
 
 # title %GRML_NAME% %VERSION% - old boot method

-# kernel /boot/isolinux/linux26 ramdisk_size=100000 init=/etc/init lang=us apm=power-off vga=791 nomce quiet grml_dir="live" grml_name="grml.squashfs"
+# kernel /boot/isolinux/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/isolinux/minirt26.gz
 # initrd /boot/isolinux/minirt26.gz

diff --git a/templates/boot/isolinux/isolinux.cfg b/templates/boot/isolinux/isolinux.cfg
index 5dab5f1..b3597a2 100644 (file)
--- a/templates/boot/isolinux/isolinux.cfg
+++ b/templates/boot/isolinux/isolinux.cfg
@@ -1,7 +1,7 @@
 # use this to control the bootup via a serial port
 # SERIAL 0 9600
 DEFAULT grml
 # use this to control the bootup via a serial port
 # SERIAL 0 9600
 DEFAULT grml

-APPEND lang=us apm=power-off vga=791 quiet initrd=initrd.gz boot=live nomce
+APPEND apm=power-off lang=us vga=791 quiet initrd=initrd.gz boot=live nomce

 # DEFAULT menu.c32
 TIMEOUT 300
 # ONTIMEOUT chain.32 hd0 0
 # DEFAULT menu.c32
 TIMEOUT 300
 # ONTIMEOUT chain.32 hd0 0


@@ -28,58 +28,58 @@ LABEL grml
 MENU LABEL grml - Standard Bootup
 MENU DEFAULT
 KERNEL linux26
 MENU LABEL grml - Standard Bootup
 MENU DEFAULT
 KERNEL linux26

-APPEND lang=us apm=power-off vga=791 quiet initrd=initrd.gz boot=live nomce
-# APPEND lang=us apm=power-off vga=791 live-media-path=/GRML quiet initrd=initrd.gz boot=live nomce
+APPEND apm=power-off lang=us vga=791 quiet initrd=initrd.gz boot=live nomce
+# APPEND apm=power-off lang=us vga=791 live-media-path=/GRML quiet initrd=initrd.gz boot=live nomce

 
 LABEL old
 MENU LABEL old
 KERNEL linux26
 
 LABEL old
 MENU LABEL old
 KERNEL linux26

-APPEND ramdisk_size=100000 init=/etc/init lang=us apm=power-off vga=791 nomce quiet grml_dir="live" grml_name="grml.squashfs"
+APPEND ramdisk_size=100000 init=/etc/init apm=power-off lang=us vga=791 nomce quiet grml_dir="live" grml_name="grml.squashfs"

 
 LABEL splash
 MENU LABEL grml - Bootsplash
 KERNEL linux26
 
 LABEL splash
 MENU LABEL grml - Bootsplash
 KERNEL linux26

-APPEND lang=us apm=power-off vga=791 quiet initrd=initrd.gz boot=live splash nomce
+APPEND apm=power-off lang=us vga=791 quiet initrd=initrd.gz boot=live splash nomce

 
 LABEL grml2hd
 MENU LABEL grml2hd
 KERNEL linux26
 
 LABEL grml2hd
 MENU LABEL grml2hd
 KERNEL linux26

-APPEND lang=us apm=power-off quiet initrd=initrd.gz boot=live nomce
+APPEND apm=power-off lang=us quiet initrd=initrd.gz boot=live nomce

 
 LABEL debug
 MENU LABEL debug
 KERNEL linux26
 
 LABEL debug
 MENU LABEL debug
 KERNEL linux26

-APPEND lang=us apm=power-off vga=791 verbose debug=vc debug initrd=initrd.gz boot=live initcall_debug nomce
+APPEND apm=power-off lang=us vga=791 verbose debug=vc debug initrd=initrd.gz boot=live initcall_debug nomce

 
 LABEL bootchart
 MENU LABEL bootchart
 KERNEL linux26
 
 LABEL bootchart
 MENU LABEL bootchart
 KERNEL linux26

-APPEND init=/sbin/bootchartd lang=us apm=power-off vga=791 quiet initrd=initrd.gz boot=live nomce
+APPEND init=/sbin/bootchartd apm=power-off lang=us vga=791 quiet initrd=initrd.gz boot=live nomce

 
 LABEL vmware
 MENU LABEL vmware
 KERNEL linux26
 
 LABEL vmware
 MENU LABEL vmware
 KERNEL linux26

-APPEND lang=us apm=power-off nousb nousb2 nofirewire vga=791 quiet initrd=initrd.gz boot=live nomce
+APPEND apm=power-off lang=us nousb nousb2 nofirewire vga=791 quiet initrd=initrd.gz boot=live nomce

 
 LABEL qemu
 MENU LABEL qemu
 KERNEL linux26
 
 LABEL qemu
 MENU LABEL qemu
 KERNEL linux26

-APPEND lang=us apm=power-off nousb nousb2 nofirewire vga=791 quiet initrd=initrd.gz boot=live nomce qemu
+APPEND apm=power-off lang=us nousb nousb2 nofirewire vga=791 quiet initrd=initrd.gz boot=live nomce qemu

 
 LABEL grmlx
 MENU LABEL grmlx
 KERNEL linux26
 
 LABEL grmlx
 MENU LABEL grmlx
 KERNEL linux26

-APPEND lang=us apm=power-off startx=wm-ng vga=791 quiet initrd=initrd.gz boot=live nomce
+APPEND apm=power-off lang=us startx=wm-ng vga=791 quiet initrd=initrd.gz boot=live nomce

 
 LABEL nofb
 MENU LABEL grml without framebuffer
 KERNEL linux26
 
 LABEL nofb
 MENU LABEL grml without framebuffer
 KERNEL linux26

-APPEND lang=us apm=power-off vga=normal video=ofonly quiet initrd=initrd.gz boot=live nomce
+APPEND apm=power-off lang=us vga=normal video=ofonly quiet initrd=initrd.gz boot=live nomce

 
 LABEL linux26
 MENU LABEL linux26
 KERNEL linux26
 
 LABEL linux26
 MENU LABEL linux26
 KERNEL linux26

-APPEND lang=us apm=power-off vga=791 quiet initrd=initrd.gz boot=live nomce
+APPEND apm=power-off lang=us vga=791 quiet initrd=initrd.gz boot=live nomce

 
 LABEL memtest
 MENU LABEL memtest
 
 LABEL memtest
 MENU LABEL memtest


@@ -89,17 +89,17 @@ APPEND BOOT_IMAGE=memtest
 LABEL fb1280x1024
 MENU LABEL fb1280x1024
 KERNEL linux26
 LABEL fb1280x1024
 MENU LABEL fb1280x1024
 KERNEL linux26

-APPEND lang=us apm=power-off vga=794 quiet initrd=initrd.gz boot=live nomce
+APPEND apm=power-off lang=us vga=794 quiet initrd=initrd.gz boot=live nomce

 
 LABEL fb1024x768
 MENU LABEL fb1024x768
 KERNEL linux26
 
 LABEL fb1024x768
 MENU LABEL fb1024x768
 KERNEL linux26

-APPEND lang=us apm=power-off vga=791 quiet initrd=initrd.gz boot=live nomce
+APPEND apm=power-off lang=us vga=791 quiet initrd=initrd.gz boot=live nomce

 
 LABEL fb800x600
 MENU LABEL fb800x600
 KERNEL linux26
 
 LABEL fb800x600
 MENU LABEL fb800x600
 KERNEL linux26

-APPEND lang=us apm=power-off vga=788 quiet initrd=initrd.gz boot=live nomce
+APPEND apm=power-off lang=us vga=788 quiet initrd=initrd.gz boot=live nomce

 
 LABEL failsafe
 MENU LABEL failsafe
 
 LABEL failsafe
 MENU LABEL failsafe


@@ -124,7 +124,7 @@ APPEND initrd=balder10.imz
 LABEL serial
 MENU LABEL serial
 KERNEL linux26
 LABEL serial
 MENU LABEL serial
 KERNEL linux26

-APPEND lang=us apm=power-off vga=normal video=vesafb:off quiet initrd=initrd.gz boot=live nomce
+APPEND apm=power-off lang=us vga=normal video=vesafb:off quiet initrd=initrd.gz boot=live nomce

 
 LABEL userdef
 MENU LABEL User defined
 
 LABEL userdef
 MENU LABEL User defined

diff --git a/templates/boot/isolinux/syslinux.cfg b/templates/boot/isolinux/syslinux.cfg
index 21ef563..6c3e0ab 100644 (file)
--- a/templates/boot/isolinux/syslinux.cfg
+++ b/templates/boot/isolinux/syslinux.cfg
@@ -1,7 +1,7 @@
 # use this to control the bootup via a serial port
 # SERIAL 0 9600
 DEFAULT grml
 # use this to control the bootup via a serial port
 # SERIAL 0 9600
 DEFAULT grml

-APPEND lang=us apm=power-off vga=791 quiet initrd=initrd.gz boot=live nomce
+APPEND apm=power-off lang=us vga=791 quiet initrd=initrd.gz boot=live nomce

 # DEFAULT menu.c32
 TIMEOUT 300
 # ONTIMEOUT chain.32 hd0 0
 # DEFAULT menu.c32
 TIMEOUT 300
 # ONTIMEOUT chain.32 hd0 0


@@ -28,58 +28,58 @@ LABEL grml
 MENU LABEL grml - Standard Bootup
 MENU DEFAULT
 KERNEL linux26
 MENU LABEL grml - Standard Bootup
 MENU DEFAULT
 KERNEL linux26

-APPEND lang=us apm=power-off vga=791 quiet initrd=initrd.gz boot=live nomce
-# APPEND lang=us apm=power-off vga=791 live-media-path=/GRML quiet initrd=initrd.gz boot=live nomce
+APPEND apm=power-off lang=us vga=791 quiet initrd=initrd.gz boot=live nomce
+# APPEND apm=power-off lang=us vga=791 live-media-path=/GRML quiet initrd=initrd.gz boot=live nomce

 
 LABEL old
 MENU LABEL old
 KERNEL linux26
 
 LABEL old
 MENU LABEL old
 KERNEL linux26

-APPEND ramdisk_size=100000 init=/etc/init lang=us apm=power-off vga=791 nomce quiet grml_dir="live" grml_name="grml.squashfs"
+APPEND ramdisk_size=100000 init=/etc/init apm=power-off lang=us vga=791 nomce quiet grml_dir="live" grml_name="grml.squashfs"

 
 LABEL splash
 MENU LABEL grml - Bootsplash
 KERNEL linux26
 
 LABEL splash
 MENU LABEL grml - Bootsplash
 KERNEL linux26

-APPEND lang=us apm=power-off vga=791 quiet initrd=initrd.gz boot=live splash nomce
+APPEND apm=power-off lang=us vga=791 quiet initrd=initrd.gz boot=live splash nomce

 
 LABEL grml2hd
 MENU LABEL grml2hd
 KERNEL linux26
 
 LABEL grml2hd
 MENU LABEL grml2hd
 KERNEL linux26

-APPEND lang=us apm=power-off quiet initrd=initrd.gz boot=live nomce
+APPEND apm=power-off lang=us quiet initrd=initrd.gz boot=live nomce

 
 LABEL debug
 MENU LABEL debug
 KERNEL linux26
 
 LABEL debug
 MENU LABEL debug
 KERNEL linux26

-APPEND lang=us apm=power-off vga=791 verbose debug=vc debug initrd=initrd.gz boot=live initcall_debug nomce
+APPEND apm=power-off lang=us vga=791 verbose debug=vc debug initrd=initrd.gz boot=live initcall_debug nomce

 
 LABEL bootchart
 MENU LABEL bootchart
 KERNEL linux26
 
 LABEL bootchart
 MENU LABEL bootchart
 KERNEL linux26

-APPEND init=/sbin/bootchartd lang=us apm=power-off vga=791 quiet initrd=initrd.gz boot=live nomce
+APPEND init=/sbin/bootchartd apm=power-off lang=us vga=791 quiet initrd=initrd.gz boot=live nomce

 
 LABEL vmware
 MENU LABEL vmware
 KERNEL linux26
 
 LABEL vmware
 MENU LABEL vmware
 KERNEL linux26

-APPEND lang=us apm=power-off nousb nousb2 nofirewire vga=791 quiet initrd=initrd.gz boot=live nomce
+APPEND apm=power-off lang=us nousb nousb2 nofirewire vga=791 quiet initrd=initrd.gz boot=live nomce

 
 LABEL qemu
 MENU LABEL qemu
 KERNEL linux26
 
 LABEL qemu
 MENU LABEL qemu
 KERNEL linux26

-APPEND lang=us apm=power-off nousb nousb2 nofirewire vga=791 quiet initrd=initrd.gz boot=live nomce qemu
+APPEND apm=power-off lang=us nousb nousb2 nofirewire vga=791 quiet initrd=initrd.gz boot=live nomce qemu

 
 LABEL grmlx
 MENU LABEL grmlx
 KERNEL linux26
 
 LABEL grmlx
 MENU LABEL grmlx
 KERNEL linux26

-APPEND lang=us apm=power-off startx=wm-ng vga=791 quiet initrd=initrd.gz boot=live nomce
+APPEND apm=power-off lang=us startx=wm-ng vga=791 quiet initrd=initrd.gz boot=live nomce

 
 LABEL nofb
 MENU LABEL grml without framebuffer
 KERNEL linux26
 
 LABEL nofb
 MENU LABEL grml without framebuffer
 KERNEL linux26

-APPEND lang=us apm=power-off vga=normal video=ofonly quiet initrd=initrd.gz boot=live nomce
+APPEND apm=power-off lang=us vga=normal video=ofonly quiet initrd=initrd.gz boot=live nomce

 
 LABEL linux26
 MENU LABEL linux26
 KERNEL linux26
 
 LABEL linux26
 MENU LABEL linux26
 KERNEL linux26

-APPEND lang=us apm=power-off vga=791 quiet initrd=initrd.gz boot=live nomce
+APPEND apm=power-off lang=us vga=791 quiet initrd=initrd.gz boot=live nomce

 
 LABEL memtest
 MENU LABEL memtest
 
 LABEL memtest
 MENU LABEL memtest


@@ -89,17 +89,17 @@ APPEND BOOT_IMAGE=memtest
 LABEL fb1280x1024
 MENU LABEL fb1280x1024
 KERNEL linux26
 LABEL fb1280x1024
 MENU LABEL fb1280x1024
 KERNEL linux26

-APPEND lang=us apm=power-off vga=794 quiet initrd=initrd.gz boot=live nomce
+APPEND apm=power-off lang=us vga=794 quiet initrd=initrd.gz boot=live nomce

 
 LABEL fb1024x768
 MENU LABEL fb1024x768
 KERNEL linux26
 
 LABEL fb1024x768
 MENU LABEL fb1024x768
 KERNEL linux26

-APPEND lang=us apm=power-off vga=791 quiet initrd=initrd.gz boot=live nomce
+APPEND apm=power-off lang=us vga=791 quiet initrd=initrd.gz boot=live nomce

 
 LABEL fb800x600
 MENU LABEL fb800x600
 KERNEL linux26
 
 LABEL fb800x600
 MENU LABEL fb800x600
 KERNEL linux26

-APPEND lang=us apm=power-off vga=788 quiet initrd=initrd.gz boot=live nomce
+APPEND apm=power-off lang=us vga=788 quiet initrd=initrd.gz boot=live nomce

 
 LABEL failsafe
 MENU LABEL failsafe
 
 LABEL failsafe
 MENU LABEL failsafe


@@ -124,7 +124,7 @@ APPEND initrd=balder10.imz
 LABEL serial
 MENU LABEL serial
 KERNEL linux26
 LABEL serial
 MENU LABEL serial
 KERNEL linux26

-APPEND lang=us apm=power-off vga=normal video=vesafb:off quiet initrd=initrd.gz boot=live nomce
+APPEND apm=power-off lang=us vga=normal video=vesafb:off quiet initrd=initrd.gz boot=live nomce

 
 LABEL userdef
 MENU LABEL User defined
 
 LABEL userdef
 MENU LABEL User defined