projects
/
grml-live.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
also set cirrus.modeset=0 for the nomodeset options
[grml-live.git]
/
templates
/
boot
/
grub
/
%SHORT_NAME%_options.cfg
diff --git
a/templates/boot/grub/%SHORT_NAME%_options.cfg
b/templates/boot/grub/%SHORT_NAME%_options.cfg
index
256ddd2
..
9791349
100644
(file)
--- a/
templates/boot/grub/%SHORT_NAME%_options.cfg
+++ b/
templates/boot/grub/%SHORT_NAME%_options.cfg
@@
-34,7
+34,7
@@
menuentry "%GRML_NAME% - start X by default" {
menuentry "%GRML_NAME% - disable framebuffer" {
set gfxpayload=text
echo 'Loading kernel...'
menuentry "%GRML_NAME% - disable framebuffer" {
set gfxpayload=text
echo 'Loading kernel...'
- linux /boot/%SHORT_NAME%/vmlinuz apm=power-off boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" video=ofonly radeon.modeset=0 i915.modeset=0 nouveau.modeset=0 nomodeset
+ linux /boot/%SHORT_NAME%/vmlinuz apm=power-off boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" video=ofonly radeon.modeset=0 i915.modeset=0 nouveau.modeset=0
cirrus.modeset=0
nomodeset
echo 'Loading initrd...'
initrd /boot/%SHORT_NAME%/initrd.img
}
echo 'Loading initrd...'
initrd /boot/%SHORT_NAME%/initrd.img
}
@@
-42,7
+42,7
@@
menuentry "%GRML_NAME% - disable framebuffer" {
menuentry "%GRML_NAME% - disable Kernel Mode-Setting" {
set gfxpayload=keep
echo 'Loading kernel...'
menuentry "%GRML_NAME% - disable Kernel Mode-Setting" {
set gfxpayload=keep
echo 'Loading kernel...'
- linux /boot/%SHORT_NAME%/vmlinuz apm=power-off boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" radeon.modeset=0 i915.modeset=0 nouveau.modeset=0 nomodeset
+ linux /boot/%SHORT_NAME%/vmlinuz apm=power-off boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" radeon.modeset=0 i915.modeset=0 nouveau.modeset=0
cirrus.modeset=0
nomodeset
echo 'Loading initrd...'
initrd /boot/%SHORT_NAME%/initrd.img
}
echo 'Loading initrd...'
initrd /boot/%SHORT_NAME%/initrd.img
}