projects
/
grml-live.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add .gitignore to ignore files from etc/grml/fai/config/basefiles
[grml-live.git]
/
templates
/
boot
/
isolinux
/
grml.cfg
diff --git
a/templates/boot/isolinux/grml.cfg
b/templates/boot/isolinux/grml.cfg
index
eee0ed7
..
a3db2a4
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 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 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
@@
-103,9
+103,7
@@
label persistence
Boot Grml and enable persistency
feature to store system and
settings on an external device
Boot Grml and enable persistency
feature to store system and
settings on an external device
- with label persistence or
- (deprecated) full-ov, custom-ov,
- live-rw or home-rw.
+ with label persistence.
endtext
label serial
endtext
label serial