projects
/
grml-live-grml.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
9ec8192
)
Drop debug from bootoptions and use debug=vc only.
author
Michael Prokop
<mika@grml.org>
Fri, 26 Feb 2010 11:09:15 +0000
(12:09 +0100)
committer
Michael Prokop
<mika@grml.org>
Fri, 26 Feb 2010 11:09:15 +0000
(12:09 +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
01e9705
..
b3bf32c
100644
(file)
--- a/
templates/boot/grub/grub.cfg
+++ b/
templates/boot/grub/grub.cfg
@@
-99,7
+99,7
@@
menuentry "%GRML_NAME% - failsafe mode" {
}
menuentry "%GRML_NAME% - debug mode" {
}
menuentry "%GRML_NAME% - debug mode" {
- linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% bootfrom=removable nomce vga=791 initcall
_debug
verbose debug=vc
+ linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% bootfrom=removable nomce vga=791 initcall verbose debug=vc
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
a0f158b
..
dcceeb2
100644
(file)
--- a/
templates/boot/grub/menu.lst
+++ b/
templates/boot/grub/menu.lst
@@
-32,7
+32,7
@@
kernel /boot/%SHORT_NAME%/linux26 vga=normal boot=live bootid=%BOOTID% bootfrom=
initrd /boot/%SHORT_NAME%/initrd.gz
title %GRML_NAME% %VERSION% - debug mode
initrd /boot/%SHORT_NAME%/initrd.gz
title %GRML_NAME% %VERSION% - debug mode
-kernel /boot/%SHORT_NAME%/linux26 apm=power-off vga=791 verbose debug=vc
debug
initrd=initrd.gz boot=live bootid=%BOOTID% bootfrom=removable initcall_debug nomce
+kernel /boot/%SHORT_NAME%/linux26 apm=power-off vga=791 verbose debug=vc initrd=initrd.gz boot=live bootid=%BOOTID% bootfrom=removable initcall_debug nomce
initrd /boot/%SHORT_NAME%/initrd.gz
title %GRML_NAME% %VERSION% - copy grml squashfs file to RAM
initrd /boot/%SHORT_NAME%/initrd.gz
title %GRML_NAME% %VERSION% - copy grml squashfs file to RAM
diff --git
a/templates/boot/isolinux/grml.cfg
b/templates/boot/isolinux/grml.cfg
index
9aadb06
..
3f87dec
100644
(file)
--- a/
templates/boot/isolinux/grml.cfg
+++ b/
templates/boot/isolinux/grml.cfg
@@
-5,7
+5,7
@@
label debug
menu label %GRML_NAME% - ^Debug Mode
kernel /boot/%SHORT_NAME%/linux26
label debug
menu label %GRML_NAME% - ^Debug Mode
kernel /boot/%SHORT_NAME%/linux26
- append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% bootfrom=removable apm=power-off vga=791 verbose debug=vc
debug initcall_debug
nomce
+ append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% bootfrom=removable apm=power-off vga=791 verbose debug=vc
initcall
nomce
text help
Boot Grml in debug mode, which
text help
Boot Grml in debug mode, which
diff --git
a/templates/boot/isolinux/hidden.cfg
b/templates/boot/isolinux/hidden.cfg
index
f63ae24
..
1775268
100644
(file)
--- a/
templates/boot/isolinux/hidden.cfg
+++ b/
templates/boot/isolinux/hidden.cfg
@@
-16,7
+16,7
@@
append apm=power-off vga=791 initrd=/boot/%SHORT_NAME%/initrd.gz boot=live booti
label debug
menu hide
kernel /boot/%SHORT_NAME%/linux26
label debug
menu hide
kernel /boot/%SHORT_NAME%/linux26
-append apm=power-off vga=791 verbose debug=vc
debug
initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% bootfrom=removable initcall_debug nomce
+append apm=power-off vga=791 verbose debug=vc initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% bootfrom=removable initcall_debug nomce
label bootchart
menu hide
label bootchart
menu hide