projects
/
grml-live.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
SW: (Re)add aufs-tools to GRMLBASE.
[grml-live.git]
/
templates
/
boot
/
grub
/
grub.cfg
diff --git
a/templates/boot/grub/grub.cfg
b/templates/boot/grub/grub.cfg
index
fde7a39
..
0cb37b1
100644
(file)
--- a/
templates/boot/grub/grub.cfg
+++ b/
templates/boot/grub/grub.cfg
@@
-20,9
+20,17
@@
else
set menu_color_highlight=black/yellow
fi
set menu_color_highlight=black/yellow
fi
+# make sure we can access partitions
+insmod part_msdos
+insmod part_gpt
+
+if [ ${iso_path} ] ; then
+ set loopback="findiso=${iso_path}"
+fi
+
menuentry "%GRML_NAME% - release %VERSION% (default)" {
set gfxpayload=1024x768
menuentry "%GRML_NAME% - release %VERSION% (default)" {
set gfxpayload=1024x768
- linux /boot/%SHORT_NAME%/linux26 apm=power-off quiet boot=live bootid=%BOOTID% nomce
+ linux /boot/%SHORT_NAME%/linux26 apm=power-off quiet boot=live bootid=%BOOTID%
"${loopback}" "${kernelopts}"
nomce
initrd /boot/%SHORT_NAME%/initrd.gz
}
initrd /boot/%SHORT_NAME%/initrd.gz
}
@@
-63,57
+71,61
@@
menuentry "MirOS bsd4grml (fallback method)" {
}
menuentry "Boot OS of first partition on first disk" {
}
menuentry "Boot OS of first partition on first disk" {
+ set root=(hd0,1)
chainloader +1
}
menuentry "%GRML_NAME% - enable persistent mode" {
set gfxpayload=1024x768x16,1024x768
chainloader +1
}
menuentry "%GRML_NAME% - enable persistent mode" {
set gfxpayload=1024x768x16,1024x768
- linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce quiet persistent
+ linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce
"${loopback}" "${kernelopts}"
quiet persistent
initrd /boot/%SHORT_NAME%/initrd.gz
}
menuentry "%GRML_NAME% - copy Grml to RAM" {
set gfxpayload=1024x768
initrd /boot/%SHORT_NAME%/initrd.gz
}
menuentry "%GRML_NAME% - copy Grml to RAM" {
set gfxpayload=1024x768
- linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce quiet toram=%GRML_NAME%.squashfs
+ linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce
"${loopback}" "${kernelopts}"
quiet toram=%GRML_NAME%.squashfs
initrd /boot/%SHORT_NAME%/initrd.gz
}
menuentry "%GRML_NAME% - copy whole medium to RAM" {
set gfxpayload=1024x768
initrd /boot/%SHORT_NAME%/initrd.gz
}
menuentry "%GRML_NAME% - copy whole medium to RAM" {
set gfxpayload=1024x768
- linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce
quiet toram
+ linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce
"${loopback}" "${kernelopts}" quiet toram
initrd /boot/%SHORT_NAME%/initrd.gz
}
menuentry "%GRML_NAME% - start X by default" {
set gfxpayload=1024x768
initrd /boot/%SHORT_NAME%/initrd.gz
}
menuentry "%GRML_NAME% - start X by default" {
set gfxpayload=1024x768
- linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce quiet startx=wm-ng
+ linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce
"${loopback}" "${kernelopts}"
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 bootid=%BOOTID% nomce quiet vga=normal video=ofonly
+ set gfxpayload=text
+ linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" quietvideo=ofonly
initrd /boot/%SHORT_NAME%/initrd.gz
}
menuentry "%GRML_NAME% - forensic mode" {
set gfxpayload=1024x768
initrd /boot/%SHORT_NAME%/initrd.gz
}
menuentry "%GRML_NAME% - forensic mode" {
set gfxpayload=1024x768
- linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce readonly quiet nofstab noraid nolvm noautoconfig noswap raid=noautodetect
+ linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce
"${loopback}" "${kernelopts}"
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 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
+ set gfxpayload=text
+ linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" quiet 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" {
set gfxpayload=1024x768
initrd /boot/%SHORT_NAME%/initrd.gz
}
menuentry "%GRML_NAME% - debug mode" {
set gfxpayload=1024x768
- linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce
initcall verbose debug=vc
+ linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce
"${loopback}" "${kernelopts}" 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 bootid=%BOOTID% nomce quiet vga=normal video=vesafb:off console=tty1 console=ttyS0,9600n8
+ set gfxpayload=text
+ linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" quiet video=vesafb:off console=tty1 console=ttyS0,9600n8
initrd /boot/%SHORT_NAME%/initrd.gz
}
initrd /boot/%SHORT_NAME%/initrd.gz
}