projects
/
grml-live.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2b047e0
)
Support conf/bootid.txt and use bootoption bootfrom=removable by default.
author
Michael Prokop
<mika@grml.org>
Mon, 1 Feb 2010 22:34:39 +0000
(23:34 +0100)
committer
Michael Prokop
<mika@grml.org>
Mon, 1 Feb 2010 23:11:14 +0000
(
00:11
+0100)
grml-live
patch
|
blob
|
history
templates/boot/grub/grub.cfg
patch
|
blob
|
history
templates/boot/grub/menu.lst
patch
|
blob
|
history
templates/boot/isolinux/default.cfg
patch
|
blob
|
history
templates/boot/isolinux/grml.cfg
patch
|
blob
|
history
templates/boot/isolinux/hidden.cfg
patch
|
blob
|
history
templates/boot/isolinux/syslinux.cfg
patch
|
blob
|
history
diff --git
a/grml-live
b/grml-live
index
6eadde8
..
f71ce70
100755
(executable)
--- a/
grml-live
+++ b/
grml-live
@@
-714,6
+714,10
@@
if [ "$ARCH" = i386 ] || [ "$ARCH" = amd64 ] ; then
# make sure the squashfs filename is set accordingly:
SQUASHFS_NAME="$GRML_NAME.squashfs"
# make sure the squashfs filename is set accordingly:
SQUASHFS_NAME="$GRML_NAME.squashfs"
+ [ -n "$BOOTID" ] || BOOTID="$(echo ${GRML_NAME}${VERSION} | tr -d ',./;\- ')"
+ [ -d "$BUILD_OUTPUT"/conf ] || mkdir "$BUILD_OUTPUT"/conf
+ echo "$BOOTID" > "$BUILD_OUTPUT"/conf/bootid.txt
+
# adjust all variables in the templates with the according distribution information
for file in "${BUILD_OUTPUT}"/boot/isolinux/*.cfg "${BUILD_OUTPUT}"/boot/isolinux/*.msg \
"${BUILD_OUTPUT}"/boot/grub/* ; do
# adjust all variables in the templates with the according distribution information
for file in "${BUILD_OUTPUT}"/boot/isolinux/*.cfg "${BUILD_OUTPUT}"/boot/isolinux/*.msg \
"${BUILD_OUTPUT}"/boot/grub/* ; do
@@
-727,6
+731,7
@@
if [ "$ARCH" = i386 ] || [ "$ARCH" = amd64 ] ; then
sed -i "s/%RELEASE_INFO%/$RELEASE_INFO/g" "${file}"
sed -i "s/%SHORT_NAME%/$SHORT_NAME/g" "${file}"
sed -i "s/%VERSION%/$VERSION/g" "${file}"
sed -i "s/%RELEASE_INFO%/$RELEASE_INFO/g" "${file}"
sed -i "s/%SHORT_NAME%/$SHORT_NAME/g" "${file}"
sed -i "s/%VERSION%/$VERSION/g" "${file}"
+ sed -i "s/%BOOTID%/$BOOTID/g" "${file}"
done
# adjust bootsplash accordingly but make sure the string has the according lenght
done
# adjust bootsplash accordingly but make sure the string has the according lenght
diff --git
a/templates/boot/grub/grub.cfg
b/templates/boot/grub/grub.cfg
index
8bb254f
..
a245fa7
100644
(file)
--- a/
templates/boot/grub/grub.cfg
+++ b/
templates/boot/grub/grub.cfg
@@
-19,7
+19,7
@@
else
fi
menuentry "%GRML_NAME% - release %VERSION% (default)" {
fi
menuentry "%GRML_NAME% - release %VERSION% (default)" {
- linux /boot/%SHORT_NAME%/linux26 apm=power-off vga=791 quiet boot=live nomce
+ linux /boot/%SHORT_NAME%/linux26 apm=power-off vga=791 quiet boot=live
bootid=%BOOTID% bootfrom=removable
nomce
initrd /boot/%SHORT_NAME%/initrd.gz
}
initrd /boot/%SHORT_NAME%/initrd.gz
}
@@
-60,47
+60,47
@@
menuentry "Boot OS of first partition on first disk" {
}
menuentry "%GRML_NAME% - enable persistent mode" {
}
menuentry "%GRML_NAME% - enable persistent mode" {
- linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live nomce vga=791 quiet persistent
+ 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" {
initrd /boot/%SHORT_NAME%/initrd.gz
}
menuentry "%GRML_NAME% - copy grml to RAM" {
- linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live nomce vga=791 quiet toram=%GRML_NAME%.squashfs
+ 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" {
initrd /boot/%SHORT_NAME%/initrd.gz
}
menuentry "%GRML_NAME% - copy whole medium to RAM" {
- linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live nomce vga=791 quiet toram
+ 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" {
initrd /boot/%SHORT_NAME%/initrd.gz
}
menuentry "%GRML_NAME% - start X by default" {
- linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live nomce vga=791 quiet startx=wm-ng
+ 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" {
initrd /boot/%SHORT_NAME%/initrd.gz
}
menuentry "%GRML_NAME% - disable framebuffer" {
- linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live nomce quiet vga=normal video=ofonly
+ 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" {
initrd /boot/%SHORT_NAME%/initrd.gz
}
menuentry "%GRML_NAME% - forensic mode" {
- linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live nomce vga=791 readonly quiet nofstab noraid nolvm noautoconfig noswap raid=noautodetect
+ 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" {
initrd /boot/%SHORT_NAME%/initrd.gz
}
menuentry "%GRML_NAME% - failsafe mode" {
- linux /boot/%SHORT_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
+ 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" {
initrd /boot/%SHORT_NAME%/initrd.gz
}
menuentry "%GRML_NAME% - debug mode" {
- linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live nomce vga=791 debug boot=live initcall_debug
+ 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" {
initrd /boot/%SHORT_NAME%/initrd.gz
}
menuentry "%GRML_NAME% - serial mode" {
- linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live nomce quiet vga=normal video=vesafb:off noquick console=tty1 console=ttyS0,9600n8
+ 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
}
initrd /boot/%SHORT_NAME%/initrd.gz
}
diff --git
a/templates/boot/grub/menu.lst
b/templates/boot/grub/menu.lst
index
d8e9d21
..
a0f158b
100644
(file)
--- 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)
# define entries:
title %GRML_NAME% %VERSION% - Default boot (using 1024x768 framebuffer)
-kernel /boot/%SHORT_NAME%/linux26 apm=power-off vga=791 quiet boot=live nomce
+kernel /boot/%SHORT_NAME%/linux26 apm=power-off vga=791 quiet boot=live
bootid=%BOOTID% bootfrom=removable
nomce
initrd /boot/%SHORT_NAME%/initrd.gz
title %GRML_NAME% %VERSION% - without framebuffer
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 nomce
+kernel /boot/%SHORT_NAME%/linux26 apm=power-off vga=normal video=ofonly quiet initrd=initrd.gz boot=live
bootid=%BOOTID% bootfrom=removable
nomce
initrd /boot/%SHORT_NAME%/initrd.gz
title %GRML_NAME% %VERSION% - with 1280x1024 framebuffer
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 nomce
+kernel /boot/%SHORT_NAME%/linux26 apm=power-off vga=794 quiet initrd=initrd.gz boot=live
bootid=%BOOTID% bootfrom=removable
nomce
initrd /boot/%SHORT_NAME%/initrd.gz
title %GRML_NAME% %VERSION% - with 800x600 framebuffer
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 nomce
+kernel /boot/%SHORT_NAME%/linux26 apm=power-off vga=788 quiet initrd=initrd.gz boot=live
bootid=%BOOTID% bootfrom=removable
nomce
initrd /boot/%SHORT_NAME%/initrd.gz
title %GRML_NAME% %VERSION% - failsafe boot
initrd /boot/%SHORT_NAME%/initrd.gz
title %GRML_NAME% %VERSION% - failsafe boot
-kernel /boot/%SHORT_NAME%/linux26 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
+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
initrd /boot/%SHORT_NAME%/initrd.gz
title %GRML_NAME% %VERSION% - debug mode
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 debug initrd=initrd.gz boot=live initcall_debug nomce
+kernel /boot/%SHORT_NAME%/linux26 apm=power-off vga=791 verbose debug=vc debug initrd=initrd.gz boot=live
bootid=%BOOTID% bootfrom=removable
initcall_debug nomce
initrd /boot/%SHORT_NAME%/initrd.gz
title %GRML_NAME% %VERSION% - copy grml squashfs file to RAM
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 nomce
+kernel /boot/%SHORT_NAME%/linux26 toram=%GRML_NAME_SQUASHFS% apm=power-off vga=791 quiet boot=live
bootid=%BOOTID% bootfrom=removable
nomce
initrd /boot/%SHORT_NAME%/initrd.gz
title %GRML_NAME% %VERSION% - copy medium to RAM
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 nomce
+kernel /boot/%SHORT_NAME%/linux26 toram apm=power-off vga=791 quiet boot=live
bootid=%BOOTID% bootfrom=removable
nomce
initrd /boot/%SHORT_NAME%/initrd.gz
title %GRML_NAME% %VERSION% - grml2hd - install grml to local harddisk [adjust it!]
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 nomce partition=/dev/ice1 mbr=/dev/ice
+kernel /boot/%SHORT_NAME%/linux26 apm=power-off vga=791 quiet boot=live
bootid=%BOOTID% bootfrom=removable
nomce partition=/dev/ice1 mbr=/dev/ice
initrd /boot/%SHORT_NAME%/initrd.gz
title %GRML_NAME% %VERSION% - forensic mode
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
+kernel /boot/%SHORT_NAME%/linux26 vga=791 nofstab noraid nolvm noautoconfig noswap raid=noautodetect quiet initrd=initrd.gz boot=live
bootid=%BOOTID% bootfrom=removable
initrd /boot/%SHORT_NAME%/initrd.gz
title %GRML_NAME% %VERSION% - serial console mode
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 nomce noquick 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% bootfrom=removable
nomce noquick console=tty1 console=ttyS0,9600n8
initrd /boot/%SHORT_NAME%/initrd.gz
title Run memtest86+
initrd /boot/%SHORT_NAME%/initrd.gz
title Run memtest86+
diff --git
a/templates/boot/isolinux/default.cfg
b/templates/boot/isolinux/default.cfg
index
f39fda4
..
bdb5619
100644
(file)
--- a/
templates/boot/isolinux/default.cfg
+++ b/
templates/boot/isolinux/default.cfg
@@
-2,7
+2,7
@@
label grml
menu DEFAULT
menu label %GRML_NAME% ^Standard (%VERSION%, %ARCH%)
kernel /boot/%SHORT_NAME%/linux26
menu DEFAULT
menu label %GRML_NAME% ^Standard (%VERSION%, %ARCH%)
kernel /boot/%SHORT_NAME%/linux26
- append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live apm=power-off vga=791 quiet nomce
+ append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live
bootid=%BOOTID% bootfrom=removable
apm=power-off vga=791 quiet nomce
text help
Grml is a Debian based Linux live
text help
Grml is a Debian based Linux live
diff --git
a/templates/boot/isolinux/grml.cfg
b/templates/boot/isolinux/grml.cfg
index
e6db01d
..
c63dd0a
100644
(file)
--- 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
label debug
menu label %GRML_NAME% - ^Debug Mode
kernel /boot/%SHORT_NAME%/linux26
- append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live apm=power-off vga=791 verbose debug=vc debug initcall_debug nomce
+ append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live
bootid=%BOOTID% bootfrom=removable
apm=power-off vga=791 verbose debug=vc debug initcall_debug nomce
text help
Boot Grml in debug mode, which
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
label nofb
menu label %GRML_NAME% - Dis^able Framebuffer
kernel /boot/%SHORT_NAME%/linux26
- append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live apm=power-off vga=normal quiet nomce
+ append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live
bootid=%BOOTID% bootfrom=removable
apm=power-off vga=normal quiet nomce
text help
Boot Grml without framebuffer.
text help
Boot Grml without framebuffer.
@@
-25,7
+25,7
@@
label nofb
label lang-de
menu label %GRML_NAME% - Enable ^SSH (with random password)
kernel /boot/%SHORT_NAME%/linux26
label lang-de
menu label %GRML_NAME% - Enable ^SSH (with random password)
kernel /boot/%SHORT_NAME%/linux26
- append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live apm=power-off vga=791 quiet nomce ssh
+ append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live
bootid=%BOOTID% bootfrom=removable
apm=power-off vga=791 quiet nomce ssh
text help
Boot Grml and automatically start
text help
Boot Grml and automatically start
@@
-39,7
+39,7
@@
label lang-de
label failsafe
menu label %GRML_NAME% - ^Failsafe Mode
kernel /boot/%SHORT_NAME%/linux26
label failsafe
menu label %GRML_NAME% - ^Failsafe Mode
kernel /boot/%SHORT_NAME%/linux26
- append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live 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 pci=nomsi
+ append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live
bootid=%BOOTID% bootfrom=removable
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 pci=nomsi
text help
Boot Grml in failsafe mode, which
text help
Boot Grml in failsafe mode, which
@@
-52,7
+52,7
@@
label failsafe
label forensic
menu label %GRML_NAME% - F^orensic Mode
kernel /boot/%SHORT_NAME%/linux26
label forensic
menu label %GRML_NAME% - F^orensic Mode
kernel /boot/%SHORT_NAME%/linux26
- append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live 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% bootfrom=removable
apm=power-off nomce vga=791 forensic nofstab noraid nolvm noautoconfig noswap raid=noautodetect readonly quiet
text help
Boot Grml in forensic mode. This
text help
Boot Grml in forensic mode. This
@@
-65,7
+65,7
@@
label forensic
label lang-de
menu label %GRML_NAME% - ^German Settings
kernel /boot/%SHORT_NAME%/linux26
label lang-de
menu label %GRML_NAME% - ^German Settings
kernel /boot/%SHORT_NAME%/linux26
- append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live apm=power-off vga=791 quiet nomce lang=de
+ append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live
bootid=%BOOTID% bootfrom=removable
apm=power-off vga=791 quiet nomce lang=de
text help
Boot Grml with german settings.
text help
Boot Grml with german settings.
@@
-74,7
+74,7
@@
label lang-de
label %GRML_NAME%x
menu label %GRML_NAME% - Graphical ^Mode
kernel /boot/%SHORT_NAME%/linux26
label %GRML_NAME%x
menu label %GRML_NAME% - Graphical ^Mode
kernel /boot/%SHORT_NAME%/linux26
- append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live apm=power-off quiet nomce startx=wm-ng
+ append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live
bootid=%BOOTID% bootfrom=removable
apm=power-off quiet nomce startx=wm-ng
text help
Boot Grml and automatically invoke
text help
Boot Grml and automatically invoke
@@
-84,7
+84,7
@@
label %GRML_NAME%x
label grml2ram
menu label %GRML_NAME% - Load to ^RAM
kernel /boot/%SHORT_NAME%/linux26
label grml2ram
menu label %GRML_NAME% - Load to ^RAM
kernel /boot/%SHORT_NAME%/linux26
- append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live apm=power-off vga=791 quiet nomce toram=%SQUASHFS_NAME%
+ append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live
bootid=%BOOTID% bootfrom=removable
apm=power-off vga=791 quiet nomce toram=%SQUASHFS_NAME%
text help
Load Grml into the memory (RAM).
text help
Load Grml into the memory (RAM).
@@
-99,7
+99,7
@@
label grml2ram
label serial
menu label %GRML_NAME% - Serial ^Console
kernel /boot/%SHORT_NAME%/linux26
label serial
menu label %GRML_NAME% - Serial ^Console
kernel /boot/%SHORT_NAME%/linux26
- append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live apm=power-off vga=normal video=vesafb:off quiet nomce noquick console=tty1 console=ttyS0,9600n8
+ append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live
bootid=%BOOTID% bootfrom=removable
apm=power-off vga=normal video=vesafb:off quiet nomce noquick console=tty1 console=ttyS0,9600n8
text help
text help
diff --git
a/templates/boot/isolinux/hidden.cfg
b/templates/boot/isolinux/hidden.cfg
index
0fc0c7b
..
f63ae24
100644
(file)
--- 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
label splash
menu hide
kernel /boot/%SHORT_NAME%/linux26
-append apm=power-off vga=791 quiet initrd=/boot/%SHORT_NAME%/initrd.gz boot=live splash nomce
+append apm=power-off vga=791 quiet initrd=/boot/%SHORT_NAME%/initrd.gz boot=live
bootid=%BOOTID% bootfrom=removable
splash nomce
label grml2hd
menu hide
kernel /boot/%SHORT_NAME%/linux26
label grml2hd
menu hide
kernel /boot/%SHORT_NAME%/linux26
-append apm=power-off quiet initrd=/boot/%SHORT_NAME%/initrd.gz boot=live nomce
+append apm=power-off quiet initrd=/boot/%SHORT_NAME%/initrd.gz boot=live
bootid=%BOOTID% bootfrom=removable
nomce
label debian2hd
menu hide
kernel /boot/%SHORT_NAME%/linux26
label debian2hd
menu hide
kernel /boot/%SHORT_NAME%/linux26
-append apm=power-off vga=791 initrd=/boot/%SHORT_NAME%/initrd.gz boot=live BOOT_IMAGE=debian2hd nomce
+append apm=power-off vga=791 initrd=/boot/%SHORT_NAME%/initrd.gz boot=live
bootid=%BOOTID% bootfrom=removable
BOOT_IMAGE=debian2hd nomce
label debug
menu hide
kernel /boot/%SHORT_NAME%/linux26
label debug
menu hide
kernel /boot/%SHORT_NAME%/linux26
-append apm=power-off vga=791 verbose debug=vc debug initrd=/boot/%SHORT_NAME%/initrd.gz boot=live initcall_debug nomce
+append apm=power-off vga=791 verbose debug=vc debug initrd=/boot/%SHORT_NAME%/initrd.gz boot=live
bootid=%BOOTID% bootfrom=removable
initcall_debug nomce
label bootchart
menu hide
kernel /boot/%SHORT_NAME%/linux26
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 nomce
+append init=/sbin/bootchartd apm=power-off vga=791 quiet initrd=/boot/%SHORT_NAME%/initrd.gz boot=live
bootid=%BOOTID% bootfrom=removable
nomce
label vmware
menu hide
kernel /boot/%SHORT_NAME%/linux26
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 nomce
+append apm=power-off nousb nousb2 nofirewire vga=791 quiet initrd=/boot/%SHORT_NAME%/initrd.gz boot=live
bootid=%BOOTID% bootfrom=removable
nomce
label qemu
menu hide
kernel /boot/%SHORT_NAME%/linux26
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 nomce qemu
+append apm=power-off nousb nousb2 nofirewire vga=791 quiet initrd=/boot/%SHORT_NAME%/initrd.gz boot=live
bootid=%BOOTID% bootfrom=removable
nomce qemu
label grmlx
menu hide
kernel /boot/%SHORT_NAME%/linux26
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 nomce
+append apm=power-off startx=wm-ng vga=791 quiet initrd=/boot/%SHORT_NAME%/initrd.gz boot=live
bootid=%BOOTID% bootfrom=removable
nomce
label nofb
menu hide
kernel /boot/%SHORT_NAME%/linux26
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 nomce
+append apm=power-off vga=normal video=ofonly quiet initrd=/boot/%SHORT_NAME%/initrd.gz boot=live
bootid=%BOOTID% bootfrom=removable
nomce
label linux26
menu hide
kernel /boot/%SHORT_NAME%/linux26
label linux26
menu hide
kernel /boot/%SHORT_NAME%/linux26
-append apm=power-off vga=791 quiet initrd=/boot/%SHORT_NAME%/initrd.gz boot=live nomce
+append apm=power-off vga=791 quiet initrd=/boot/%SHORT_NAME%/initrd.gz boot=live
bootid=%BOOTID% bootfrom=removable
nomce
label memtest
menu hide
label memtest
menu hide
@@
-56,22
+56,22
@@
append BOOT_IMAGE=memtest
label fb1280x1024
menu hide
kernel /boot/%SHORT_NAME%/linux26
label fb1280x1024
menu hide
kernel /boot/%SHORT_NAME%/linux26
-append apm=power-off vga=794 quiet initrd=/boot/%SHORT_NAME%/initrd.gz boot=live nomce
+append apm=power-off vga=794 quiet initrd=/boot/%SHORT_NAME%/initrd.gz boot=live
bootid=%BOOTID% bootfrom=removable
nomce
label fb1024x768
menu hide
kernel /boot/%SHORT_NAME%/linux26
label fb1024x768
menu hide
kernel /boot/%SHORT_NAME%/linux26
-append apm=power-off vga=791 quiet initrd=/boot/%SHORT_NAME%/initrd.gz boot=live nomce
+append apm=power-off vga=791 quiet initrd=/boot/%SHORT_NAME%/initrd.gz boot=live
bootid=%BOOTID% bootfrom=removable
nomce
label fb800x600
menu hide
kernel /boot/%SHORT_NAME%/linux26
label fb800x600
menu hide
kernel /boot/%SHORT_NAME%/linux26
-append apm=power-off vga=788 quiet initrd=/boot/%SHORT_NAME%/initrd.gz boot=live nomce
+append apm=power-off vga=788 quiet initrd=/boot/%SHORT_NAME%/initrd.gz boot=live
bootid=%BOOTID% bootfrom=removable
nomce
label serial
menu hide
kernel /boot/%SHORT_NAME%/linux26
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 nomce noquick 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% bootfrom=removable
nomce noquick console=tty1 console=ttyS0,9600n8
label userdef
menu hide
label userdef
menu hide
diff --git
a/templates/boot/isolinux/syslinux.cfg
b/templates/boot/isolinux/syslinux.cfg
index
a17bf8c
..
319604f
100644
(file)
--- 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
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
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
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
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
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
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
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
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
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
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
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
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
LABEL memtest
MENU LABEL memtest
@@
-93,27
+93,27
@@
APPEND BOOT_IMAGE=memtest
LABEL fb1280x1024
MENU LABEL fb1280x1024
KERNEL linux26
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
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
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
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
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
LABEL grub2
MENU LABEL GRUB2
@@
-147,7
+147,7
@@
APPEND pciids=/boot/addons/pci.ids
LABEL serial
MENU LABEL serial
KERNEL linux26
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
LABEL userdef
MENU LABEL User defined