projects
/
grml-live.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't source grml-live.{conf,local} in scripts if not required
[grml-live.git]
/
templates
/
boot
/
grub
/
grub.cfg
diff --git
a/templates/boot/grub/grub.cfg
b/templates/boot/grub/grub.cfg
index
7aac3ba
..
4b24d05
100644
(file)
--- a/
templates/boot/grub/grub.cfg
+++ b/
templates/boot/grub/grub.cfg
@@
-4,7
+4,7
@@
set timeout=20
if loadfont /boot/grub/ascii.pf2 ; then
insmod png
if loadfont /boot/grub/ascii.pf2 ; then
insmod png
- set gfxmode=1920x12
8
0,1920x1080,1440x900,1024x768,auto
+ set gfxmode=1920x12
0
0,1920x1080,1440x900,1024x768,auto
insmod gfxterm
insmod vbe
terminal_output gfxterm
insmod gfxterm
insmod vbe
terminal_output gfxterm
@@
-106,7
+106,7
@@
menuentry "%GRML_NAME% - copy whole medium to RAM" {
menuentry "%GRML_NAME% - start X by default" {
set gfxpayload=keep
menuentry "%GRML_NAME% - start X by default" {
set gfxpayload=keep
- linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" quiet startx
=wm-ng
+ linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" quiet startx
initrd /boot/%SHORT_NAME%/initrd.gz
}
initrd /boot/%SHORT_NAME%/initrd.gz
}