projects
/
grml-live-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
SW: Drop ctapi-cyberjack.
[grml-live-grml.git]
/
templates
/
boot
/
grub
/
grub.cfg
diff --git
a/templates/boot/grub/grub.cfg
b/templates/boot/grub/grub.cfg
index
8bb254f
..
1bf5c8e
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
}
@@
-27,6
+27,10
@@
menuentry "Memory test (memtest86+)" {
linux16 /boot/addons/memtest
}
linux16 /boot/addons/memtest
}
+menuentry "GPXE - boot via network/PXE" {
+ linux16 /boot/addons/gpxe.lkrn
+}
+
menuentry "Grub - all in one image" {
linux /boot/addons/memdisk
initrd /boot/addons/allinone.img
menuentry "Grub - all in one image" {
linux /boot/addons/memdisk
initrd /boot/addons/allinone.img
@@
-60,47
+64,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
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 initcall verbose debug=vc
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
console=tty1 console=ttyS0,9600n8
initrd /boot/%SHORT_NAME%/initrd.gz
}
initrd /boot/%SHORT_NAME%/initrd.gz
}