From bce453262d0eb1edd54c834612ddfb7fe8bc7533 Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Wed, 5 Nov 2014 08:27:27 +0100 Subject: [PATCH] also set cirrus.modeset=0 for the nomodeset options --- templates/boot/grub/%SHORT_NAME%_options.cfg | 4 ++-- templates/boot/isolinux/grml.cfg | 4 ++-- templates/boot/isolinux/hidden.cfg | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/templates/boot/grub/%SHORT_NAME%_options.cfg b/templates/boot/grub/%SHORT_NAME%_options.cfg index 256ddd2..9791349 100644 --- 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...' - 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 } @@ -42,7 +42,7 @@ menuentry "%GRML_NAME% - disable framebuffer" { 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 } diff --git a/templates/boot/isolinux/grml.cfg b/templates/boot/isolinux/grml.cfg index eee0ed7..2e142f0 100644 --- 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 - 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 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 nomodeset nomce 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 - 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 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 nomodeset nomce vga=791 text help Boot Grml without KMS (Kernel diff --git a/templates/boot/isolinux/hidden.cfg b/templates/boot/isolinux/hidden.cfg index 59de318..65b7a7a 100644 --- 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 -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 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 nomodeset 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 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 nomodeset nomce vga=791 label vmlinuz menu hide -- 2.1.4