projects
/
grml-live-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update resolv.conf handling to properly support /run (see issue984).
[grml-live-grml.git]
/
templates
/
boot
/
isolinux
/
grml.cfg
diff --git
a/templates/boot/isolinux/grml.cfg
b/templates/boot/isolinux/grml.cfg
index
286d708
..
a3e8efa
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%/linux26
label nofb
menu label %GRML_NAME% - Dis^able Framebuffer
kernel /boot/%SHORT_NAME%/linux26
- append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off vga=normal quiet nomce
+ append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off vga=normal
radeon.modeset=0 i915.modeset=0 nouveau.modeset=0 nomodeset
quiet 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%/linux26
label nokms
menu label %GRML_NAME% - Disable ^Kernel Mode-Setting
kernel /boot/%SHORT_NAME%/linux26
- append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off radeon.modeset=0 i915.modeset=0 nouveau.modeset=0 nomodeset quiet nomce
+ append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off radeon.modeset=0 i915.modeset=0 nouveau.modeset=0 nomodeset quiet nomce
vga=791
text help
Boot Grml without KMS (Kernel
text help
Boot Grml without KMS (Kernel
@@
-49,7
+49,7
@@
label ssh
label failsafe
menu label %GRML_NAME% - ^Failsafe Mode
kernel /boot/%SHORT_NAME%/linux26
label failsafe
menu label %GRML_NAME% - ^Failsafe Mode
kernel /boot/%SHORT_NAME%/linux26
- append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off nomce vga=normal noautoconfig noapic noacpi acpi=off noudev noapm agp=off nosmp maxcpus=0 libata.dma=0 nofstab nomodules nosound nogpm nosyslog nocpu nodisc nomodem xmodule=vesa noresume selinux=0 edd=off pci=nomsi noraid nolvm noswap raid=noautodetect nodhcp
+ append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off nomce vga=normal noautoconfig noapic noacpi acpi=off noudev noapm agp=off nosmp maxcpus=0 libata.dma=0 nofstab nomodules nosound nogpm nosyslog nocpu nodisc nomodem xmodule=vesa noresume selinux=0 edd=off pci=nomsi noraid no
dmraid no
lvm noswap raid=noautodetect nodhcp
text help
Boot Grml in failsafe mode, which
disables any hardware recognition
text help
Boot Grml in failsafe mode, which
disables any hardware recognition
@@
-61,7
+61,7
@@
label failsafe
label forensic
menu label %GRML_NAME% - F^orensic Mode
kernel /boot/%SHORT_NAME%/linux26
label forensic
menu label %GRML_NAME% - F^orensic Mode
kernel /boot/%SHORT_NAME%/linux26
- append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off nomce vga=791 forensic nofstab noraid nolvm noautoconfig noswap raid=noautodetect readonly quiet
+ append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off nomce vga=791 forensic nofstab noraid no
dmraid no
lvm noautoconfig noswap raid=noautodetect readonly quiet
text help
Boot Grml in forensic mode. This
text help
Boot Grml in forensic mode. This
@@
-108,7
+108,7
@@
label grml2ram
label persistent
menu label %GRML_NAME% - ^Persistent mode
kernel /boot/%SHORT_NAME%/linux26
label persistent
menu label %GRML_NAME% - ^Persistent mode
kernel /boot/%SHORT_NAME%/linux26
- append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce persistent
+ append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce persistent
=nofiles
text help
Boot Grml and enable persistency
text help
Boot Grml and enable persistency