projects
/
grml-live.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
ae3f3ea
)
Add mgag200.modeset=0 to boot options for disabled framebuffer/KMS
author
Michael Prokop
<mika@grml.org>
Wed, 10 Dec 2014 11:26:44 +0000
(12:26 +0100)
committer
Michael Prokop
<mika@grml.org>
Wed, 10 Dec 2014 11:26:44 +0000
(12:26 +0100)
templates/GRML/grml-cheatcodes.txt
patch
|
blob
|
history
templates/boot/grub/%SHORT_NAME%_options.cfg
patch
|
blob
|
history
templates/boot/isolinux/grml.cfg
patch
|
blob
|
history
templates/boot/isolinux/hidden.cfg
patch
|
blob
|
history
diff --git
a/templates/GRML/grml-cheatcodes.txt
b/templates/GRML/grml-cheatcodes.txt
index
12fafdd
..
3bc4f16
100644
(file)
--- a/
templates/GRML/grml-cheatcodes.txt
+++ b/
templates/GRML/grml-cheatcodes.txt
@@
-243,6
+243,7
@@
grml radeon.modeset=0 nomodeset Disable Kernel Mode Setting (KMS) for Radeon
grml i915.modeset=0 nomodeset Disable Kernel Mode Setting (KMS) for Intel driver.
grml nouveau.modeset=0 nomodeset Disable Kernel Mode Setting (KMS) for Nouveau driver.
grml cirrus.modeset=0 nomodeset Disable Kernel Mode Setting (KMS) for Cirrus driver.
grml i915.modeset=0 nomodeset Disable Kernel Mode Setting (KMS) for Intel driver.
grml nouveau.modeset=0 nomodeset Disable Kernel Mode Setting (KMS) for Nouveau driver.
grml cirrus.modeset=0 nomodeset Disable Kernel Mode Setting (KMS) for Cirrus driver.
+grml mgag200.modeset=0 nomodeset Disable Kernel Mode Setting (KMS) for MGAG200 driver.
Installation related settings:
------------------------------
Installation related settings:
------------------------------
diff --git
a/templates/boot/grub/%SHORT_NAME%_options.cfg
b/templates/boot/grub/%SHORT_NAME%_options.cfg
index
9791349
..
52b5ff9
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 cirrus
.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 mgag200
.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 cirrus.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
mgag200.modeset=0
nomodeset
echo 'Loading initrd...'
initrd /boot/%SHORT_NAME%/initrd.img
}
echo 'Loading initrd...'
initrd /boot/%SHORT_NAME%/initrd.img
}
diff --git
a/templates/boot/isolinux/grml.cfg
b/templates/boot/isolinux/grml.cfg
index
2e142f0
..
4886ccc
100644
(file)
--- a/
templates/boot/isolinux/grml.cfg
+++ b/
templates/boot/isolinux/grml.cfg
@@
-16,7
+16,7
@@
label debug
label nofb
menu label %GRML_NAME% - Dis^able Framebuffer
kernel /boot/%SHORT_NAME%/vmlinuz
label nofb
menu label %GRML_NAME% - Dis^able Framebuffer
kernel /boot/%SHORT_NAME%/vmlinuz
- append initrd=/boot/%SHORT_NAME%/initrd.img boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% apm=power-off vga=normal radeon.modeset=0 i915.modeset=0 nouveau.modeset=0 cirrus.modeset=0 nomodeset nomce
+ append initrd=/boot/%SHORT_NAME%/initrd.img boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% apm=power-off vga=normal radeon.modeset=0 i915.modeset=0 nouveau.modeset=0 cirrus.modeset=0
mgag200.modeset=0
nomodeset nomce
text help
Boot Grml without framebuffer.
text help
Boot Grml without framebuffer.
@@
-25,7
+25,7
@@
label nofb
label nokms
menu label %GRML_NAME% - Disable ^Kernel Mode-Setting
kernel /boot/%SHORT_NAME%/vmlinuz
label nokms
menu label %GRML_NAME% - Disable ^Kernel Mode-Setting
kernel /boot/%SHORT_NAME%/vmlinuz
- append initrd=/boot/%SHORT_NAME%/initrd.img boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% apm=power-off radeon.modeset=0 i915.modeset=0 nouveau.modeset=0 cirrus.modeset=0 nomodeset nomce vga=791
+ append initrd=/boot/%SHORT_NAME%/initrd.img boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% apm=power-off radeon.modeset=0 i915.modeset=0 nouveau.modeset=0 cirrus.modeset=0
mgag200.modeset=0
nomodeset nomce vga=791
text help
Boot Grml without KMS (Kernel
text help
Boot Grml without KMS (Kernel
diff --git
a/templates/boot/isolinux/hidden.cfg
b/templates/boot/isolinux/hidden.cfg
index
65b7a7a
..
99fe06f
100644
(file)
--- a/
templates/boot/isolinux/hidden.cfg
+++ b/
templates/boot/isolinux/hidden.cfg
@@
-26,12
+26,12
@@
append apm=power-off startx vga=791 initrd=/boot/%SHORT_NAME%/initrd.img boot=li
label nofb
menu hide
kernel /boot/%SHORT_NAME%/vmlinuz
label nofb
menu hide
kernel /boot/%SHORT_NAME%/vmlinuz
-append apm=power-off vga=normal video=ofonly initrd=/boot/%SHORT_NAME%/initrd.img boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% nomce radeon.modeset=0 i915.modeset=0 nouveau.modeset=0 cirrus.modeset=0 nomodeset
+append apm=power-off vga=normal video=ofonly initrd=/boot/%SHORT_NAME%/initrd.img boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% nomce radeon.modeset=0 i915.modeset=0 nouveau.modeset=0 cirrus.modeset=0
mgag200.modeset=0
nomodeset
label nokms
menu hide
kernel /boot/%SHORT_NAME%/vmlinuz
label nokms
menu hide
kernel /boot/%SHORT_NAME%/vmlinuz
-append apm=power-off initrd=/boot/%SHORT_NAME%/initrd.img boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% radeon.modeset=0 i915.modeset=0 nouveau.modeset=0 cirrus.modeset=0 nomodeset nomce vga=791
+append apm=power-off initrd=/boot/%SHORT_NAME%/initrd.img boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% radeon.modeset=0 i915.modeset=0 nouveau.modeset=0 cirrus.modeset=0
mgag200.modeset=0
nomodeset nomce vga=791
label vmlinuz
menu hide
label vmlinuz
menu hide