projects
/
grml-live.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c3932cf
)
Drop noquick bootoption from serial console boot entry.
author
Michael Prokop
<mika@grml.org>
Sat, 27 Feb 2010 14:32:27 +0000
(15:32 +0100)
committer
Michael Prokop
<mika@grml.org>
Sat, 27 Feb 2010 14:32:27 +0000
(15:32 +0100)
templates/boot/grub/grub.cfg
patch
|
blob
|
history
templates/boot/grub/menu.lst
patch
|
blob
|
history
templates/boot/isolinux/grml.cfg
patch
|
blob
|
history
templates/boot/isolinux/hidden.cfg
patch
|
blob
|
history
diff --git
a/templates/boot/grub/grub.cfg
b/templates/boot/grub/grub.cfg
index
b3bf32c
..
1bf5c8e
100644
(file)
--- a/
templates/boot/grub/grub.cfg
+++ b/
templates/boot/grub/grub.cfg
@@
-104,7
+104,7
@@
menuentry "%GRML_NAME% - debug mode" {
}
menuentry "%GRML_NAME% - serial mode" {
}
menuentry "%GRML_NAME% - serial mode" {
- linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% bootfrom=removable nomce quiet vga=normal video=vesafb:off
noquick
console=tty1 console=ttyS0,9600n8
+ linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% bootfrom=removable nomce quiet vga=normal video=vesafb:off console=tty1 console=ttyS0,9600n8
initrd /boot/%SHORT_NAME%/initrd.gz
}
initrd /boot/%SHORT_NAME%/initrd.gz
}
diff --git
a/templates/boot/grub/menu.lst
b/templates/boot/grub/menu.lst
index
dcceeb2
..
15f7aa8
100644
(file)
--- a/
templates/boot/grub/menu.lst
+++ b/
templates/boot/grub/menu.lst
@@
-52,7
+52,7
@@
kernel /boot/%SHORT_NAME%/linux26 vga=791 nofstab noraid nolvm noautoconfig nosw
initrd /boot/%SHORT_NAME%/initrd.gz
title %GRML_NAME% %VERSION% - serial console mode
initrd /boot/%SHORT_NAME%/initrd.gz
title %GRML_NAME% %VERSION% - serial console mode
-kernel /boot/%SHORT_NAME%/linux26 apm=power-off vga=normal video=vesafb:off quiet initrd=initrd.gz boot=live bootid=%BOOTID% bootfrom=removable nomce
noquick
console=tty1 console=ttyS0,9600n8
+kernel /boot/%SHORT_NAME%/linux26 apm=power-off vga=normal video=vesafb:off quiet initrd=initrd.gz boot=live bootid=%BOOTID% bootfrom=removable nomce console=tty1 console=ttyS0,9600n8
initrd /boot/%SHORT_NAME%/initrd.gz
title Run memtest86+
initrd /boot/%SHORT_NAME%/initrd.gz
title Run memtest86+
diff --git
a/templates/boot/isolinux/grml.cfg
b/templates/boot/isolinux/grml.cfg
index
af95f47
..
82ef3c7
100644
(file)
--- a/
templates/boot/isolinux/grml.cfg
+++ b/
templates/boot/isolinux/grml.cfg
@@
-110,7
+110,7
@@
label persistent
label serial
menu label %GRML_NAME% - Serial ^Console
kernel /boot/%SHORT_NAME%/linux26
label serial
menu label %GRML_NAME% - Serial ^Console
kernel /boot/%SHORT_NAME%/linux26
- append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% bootfrom=removable apm=power-off vga=normal video=vesafb:off quiet nomce
noquick
console=tty1 console=ttyS0,9600n8
+ append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% bootfrom=removable apm=power-off vga=normal video=vesafb:off quiet nomce console=tty1 console=ttyS0,9600n8
text help
text help
diff --git
a/templates/boot/isolinux/hidden.cfg
b/templates/boot/isolinux/hidden.cfg
index
1775268
..
436d7eb
100644
(file)
--- a/
templates/boot/isolinux/hidden.cfg
+++ b/
templates/boot/isolinux/hidden.cfg
@@
-71,7
+71,7
@@
append apm=power-off vga=788 quiet initrd=/boot/%SHORT_NAME%/initrd.gz boot=live
label serial
menu hide
kernel /boot/%SHORT_NAME%/linux26
label serial
menu hide
kernel /boot/%SHORT_NAME%/linux26
-append apm=power-off vga=normal video=vesafb:off quiet initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% bootfrom=removable nomce
noquick
console=tty1 console=ttyS0,9600n8
+append apm=power-off vga=normal video=vesafb:off quiet initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% bootfrom=removable nomce console=tty1 console=ttyS0,9600n8
label userdef
menu hide
label userdef
menu hide