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:
5bfdcec
)
Remove the default quiet boot parameter for a verbose bootup.
author
Ulrich Dangel
<mru@grml.org>
Mon, 12 Dec 2011 18:32:39 +0000
(19:32 +0100)
committer
Ulrich Dangel
<mru@grml.org>
Mon, 12 Dec 2011 18:34:54 +0000
(19:34 +0100)
templates/boot/grub/grub.cfg
patch
|
blob
|
history
templates/boot/isolinux/default.cfg
patch
|
blob
|
history
templates/boot/isolinux/grml.cfg
patch
|
blob
|
history
templates/boot/isolinux/hidden.cfg
patch
|
blob
|
history
templates/boot/isolinux/netboot.cfg
patch
|
blob
|
history
diff --git
a/templates/boot/grub/grub.cfg
b/templates/boot/grub/grub.cfg
index
4b24d05
..
c2fdff0
100644
(file)
--- a/
templates/boot/grub/grub.cfg
+++ b/
templates/boot/grub/grub.cfg
@@
-26,7
+26,7
@@
fi
menuentry "%GRML_NAME% - release %VERSION% (default)" {
set gfxpayload=keep
menuentry "%GRML_NAME% - release %VERSION% (default)" {
set gfxpayload=keep
- linux /boot/%SHORT_NAME%/linux26 apm=power-off
quiet
boot=live bootid=%BOOTID% "${loopback}" "${kernelopts}" nomce
+ linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% "${loopback}" "${kernelopts}" nomce
initrd /boot/%SHORT_NAME%/initrd.gz
}
initrd /boot/%SHORT_NAME%/initrd.gz
}
@@
-88,49
+88,49
@@
menuentry "Boot OS of first partition on first disk" {
menuentry "%GRML_NAME% - enable persistent mode" {
set gfxpayload=keep
menuentry "%GRML_NAME% - enable persistent mode" {
set gfxpayload=keep
- linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}"
quiet
persistent=nofiles
+ linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" persistent=nofiles
initrd /boot/%SHORT_NAME%/initrd.gz
}
menuentry "%GRML_NAME% - copy Grml to RAM" {
set gfxpayload=keep
initrd /boot/%SHORT_NAME%/initrd.gz
}
menuentry "%GRML_NAME% - copy Grml to RAM" {
set gfxpayload=keep
- linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}"
quiet
toram=%GRML_NAME%.squashfs
+ linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" toram=%GRML_NAME%.squashfs
initrd /boot/%SHORT_NAME%/initrd.gz
}
menuentry "%GRML_NAME% - copy whole medium to RAM" {
set gfxpayload=keep
initrd /boot/%SHORT_NAME%/initrd.gz
}
menuentry "%GRML_NAME% - copy whole medium to RAM" {
set gfxpayload=keep
- linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}"
quiet
toram
+ linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" toram
initrd /boot/%SHORT_NAME%/initrd.gz
}
menuentry "%GRML_NAME% - start X by default" {
set gfxpayload=keep
initrd /boot/%SHORT_NAME%/initrd.gz
}
menuentry "%GRML_NAME% - start X by default" {
set gfxpayload=keep
- linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}"
quiet
startx
+ linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" startx
initrd /boot/%SHORT_NAME%/initrd.gz
}
menuentry "%GRML_NAME% - disable framebuffer" {
set gfxpayload=text
initrd /boot/%SHORT_NAME%/initrd.gz
}
menuentry "%GRML_NAME% - disable framebuffer" {
set gfxpayload=text
- linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}"
quiet
video=ofonly radeon.modeset=0 i915.modeset=0 nouveau.modeset=0 nomodeset
+ linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" video=ofonly radeon.modeset=0 i915.modeset=0 nouveau.modeset=0 nomodeset
initrd /boot/%SHORT_NAME%/initrd.gz
}
menuentry "%GRML_NAME% - disable Kernel Mode-Setting" {
set gfxpayload=keep
initrd /boot/%SHORT_NAME%/initrd.gz
}
menuentry "%GRML_NAME% - disable Kernel Mode-Setting" {
set gfxpayload=keep
- linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}"
quiet
radeon.modeset=0 i915.modeset=0 nouveau.modeset=0 nomodeset
+ linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" radeon.modeset=0 i915.modeset=0 nouveau.modeset=0 nomodeset
initrd /boot/%SHORT_NAME%/initrd.gz
}
menuentry "%GRML_NAME% - forensic mode" {
set gfxpayload=keep
initrd /boot/%SHORT_NAME%/initrd.gz
}
menuentry "%GRML_NAME% - forensic mode" {
set gfxpayload=keep
- linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" readonly
quiet
nofstab noraid nodmraid nolvm noautoconfig noswap raid=noautodetect
+ linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" readonly nofstab noraid nodmraid nolvm noautoconfig noswap raid=noautodetect
initrd /boot/%SHORT_NAME%/initrd.gz
}
menuentry "%GRML_NAME% - failsafe mode" {
set gfxpayload=text
initrd /boot/%SHORT_NAME%/initrd.gz
}
menuentry "%GRML_NAME% - failsafe mode" {
set gfxpayload=text
- linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}"
quiet
noautoconfig atapicd noapic noacpi acpi=off nomodules nofirewire noudev nousb nohotplug noapm nopcmcia nosmp maxcpus=0 noscsi noagp nodma ide=nodma noswap nofstab nosound nogpm nosyslog nodhcp nocpu nodisc nomodem xmodule=vesa noraid nodmraid nolvm noresume selinux=0 edd=off
+ linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" noautoconfig atapicd noapic noacpi acpi=off nomodules nofirewire noudev nousb nohotplug noapm nopcmcia nosmp maxcpus=0 noscsi noagp nodma ide=nodma noswap nofstab nosound nogpm nosyslog nodhcp nocpu nodisc nomodem xmodule=vesa noraid nodmraid nolvm noresume selinux=0 edd=off
initrd /boot/%SHORT_NAME%/initrd.gz
}
initrd /boot/%SHORT_NAME%/initrd.gz
}
@@
-142,7
+142,7
@@
menuentry "%GRML_NAME% - debug mode" {
menuentry "%GRML_NAME% - serial mode" {
set gfxpayload=text
menuentry "%GRML_NAME% - serial mode" {
set gfxpayload=text
- linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}"
quiet
video=vesafb:off console=tty1 console=ttyS0,9600n8
+ linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" 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/isolinux/default.cfg
b/templates/boot/isolinux/default.cfg
index
9e032a3
..
b7a93cf
100644
(file)
--- a/
templates/boot/isolinux/default.cfg
+++ b/
templates/boot/isolinux/default.cfg
@@
-3,7
+3,7
@@
label grml
menu DEFAULT
menu label %GRML_NAME% ^Standard (%VERSION%, %ARCH%)
kernel /boot/%SHORT_NAME%/linux26
menu DEFAULT
menu label %GRML_NAME% ^Standard (%VERSION%, %ARCH%)
kernel /boot/%SHORT_NAME%/linux26
- append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off vga=791
quiet
nomce
+ append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off vga=791 nomce
text help
Grml is a Debian based Linux live
text help
Grml is a Debian based Linux live
diff --git
a/templates/boot/isolinux/grml.cfg
b/templates/boot/isolinux/grml.cfg
index
bb8de19
..
b248048
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 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 vga=normal radeon.modeset=0 i915.modeset=0 nouveau.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%/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 vga=791
+ append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off radeon.modeset=0 i915.modeset=0 nouveau.modeset=0 nomodeset nomce vga=791
text help
Boot Grml without KMS (Kernel
text help
Boot Grml without KMS (Kernel
@@
-35,7
+35,7
@@
label nokms
label ssh
menu label %GRML_NAME% - Enable ^SSH (with random password)
kernel /boot/%SHORT_NAME%/linux26
label ssh
menu label %GRML_NAME% - Enable ^SSH (with random password)
kernel /boot/%SHORT_NAME%/linux26
- append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off vga=791
quiet
nomce ssh
+ append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off vga=791 nomce ssh
text help
Boot Grml and automatically start
text help
Boot Grml and automatically start
@@
-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 nodmraid 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 nodmraid nolvm noautoconfig noswap raid=noautodetect readonly
text help
Boot Grml in forensic mode. This
text help
Boot Grml in forensic mode. This
@@
-74,7
+74,7
@@
label forensic
label lang-de
menu label %GRML_NAME% - ^German Settings
kernel /boot/%SHORT_NAME%/linux26
label lang-de
menu label %GRML_NAME% - ^German Settings
kernel /boot/%SHORT_NAME%/linux26
- append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off vga=791
quiet
nomce lang=de
+ append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off vga=791 nomce lang=de
text help
Boot Grml with german settings.
text help
Boot Grml with german settings.
@@
-83,7
+83,7
@@
label lang-de
label %GRML_NAME%x
menu label %GRML_NAME% - Graphical ^Mode
kernel /boot/%SHORT_NAME%/linux26
label %GRML_NAME%x
menu label %GRML_NAME% - Graphical ^Mode
kernel /boot/%SHORT_NAME%/linux26
- append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off
quiet
nomce startx
+ append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off nomce startx
text help
Boot Grml and automatically invoke
text help
Boot Grml and automatically invoke
@@
-93,7
+93,7
@@
label %GRML_NAME%x
label grml2ram
menu label %GRML_NAME% - Load to ^RAM
kernel /boot/%SHORT_NAME%/linux26
label grml2ram
menu label %GRML_NAME% - Load to ^RAM
kernel /boot/%SHORT_NAME%/linux26
- append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off vga=791
quiet
nomce toram=%SQUASHFS_NAME%
+ append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off vga=791 nomce toram=%SQUASHFS_NAME%
text help
Load Grml into the memory (RAM).
text help
Load Grml into the memory (RAM).
@@
-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=nofiles
+ append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off vga=791 nomce persistent=nofiles
text help
Boot Grml and enable persistency
text help
Boot Grml and enable persistency
@@
-120,7
+120,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% apm=power-off vga=normal video=vesafb:off
quiet
nomce console=tty1 console=ttyS0,9600n8
+ append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off vga=normal video=vesafb:off 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
15b5e2e
..
19abfa1
100644
(file)
--- a/
templates/boot/isolinux/hidden.cfg
+++ b/
templates/boot/isolinux/hidden.cfg
@@
-1,7
+1,7
@@
label splash
menu hide
kernel /boot/%SHORT_NAME%/linux26
label splash
menu hide
kernel /boot/%SHORT_NAME%/linux26
-append apm=power-off vga=791
quiet
initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% splash nomce
+append apm=power-off vga=791 initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% splash nomce
label debian2hd
menu hide
label debian2hd
menu hide
@@
-16,27
+16,27
@@
append apm=power-off vga=791 verbose debug=vc initrd=/boot/%SHORT_NAME%/initrd.g
label bootchart
menu hide
kernel /boot/%SHORT_NAME%/linux26
label bootchart
menu hide
kernel /boot/%SHORT_NAME%/linux26
-append init=/sbin/bootchartd apm=power-off vga=791
quiet
initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% nomce
+append init=/sbin/bootchartd apm=power-off vga=791 initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% nomce
label grmlx
menu hide
kernel /boot/%SHORT_NAME%/linux26
label grmlx
menu hide
kernel /boot/%SHORT_NAME%/linux26
-append apm=power-off startx vga=791
quiet
initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% nomce
+append apm=power-off startx vga=791 initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% nomce
label nofb
menu hide
kernel /boot/%SHORT_NAME%/linux26
label nofb
menu hide
kernel /boot/%SHORT_NAME%/linux26
-append apm=power-off vga=normal video=ofonly
quiet
initrd=/boot/%SHORT_NAME%/initrd.gz boot=live 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.gz boot=live bootid=%BOOTID% nomce radeon.modeset=0 i915.modeset=0 nouveau.modeset=0 nomodeset
label nokms
menu hide
kernel /boot/%SHORT_NAME%/linux26
label nokms
menu hide
kernel /boot/%SHORT_NAME%/linux26
-append apm=power-off initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% radeon.modeset=0 i915.modeset=0 nouveau.modeset=0 nomodeset
quiet
nomce vga=791
+append apm=power-off initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% radeon.modeset=0 i915.modeset=0 nouveau.modeset=0 nomodeset nomce vga=791
label linux26
menu hide
kernel /boot/%SHORT_NAME%/linux26
label linux26
menu hide
kernel /boot/%SHORT_NAME%/linux26
-append apm=power-off vga=791
quiet
initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% nomce
+append apm=power-off vga=791 initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% nomce
label memtest
menu hide
label memtest
menu hide
@@
-46,22
+46,22
@@
append BOOT_IMAGE=memtest
label fb1280x1024
menu hide
kernel /boot/%SHORT_NAME%/linux26
label fb1280x1024
menu hide
kernel /boot/%SHORT_NAME%/linux26
-append apm=power-off vga=794
quiet
initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% nomce
+append apm=power-off vga=794 initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% nomce
label fb1024x768
menu hide
kernel /boot/%SHORT_NAME%/linux26
label fb1024x768
menu hide
kernel /boot/%SHORT_NAME%/linux26
-append apm=power-off vga=791
quiet
initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% nomce
+append apm=power-off vga=791 initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% nomce
label fb800x600
menu hide
kernel /boot/%SHORT_NAME%/linux26
label fb800x600
menu hide
kernel /boot/%SHORT_NAME%/linux26
-append apm=power-off vga=788
quiet
initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% nomce
+append apm=power-off vga=788 initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% nomce
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% nomce console=tty1 console=ttyS0,9600n8
+append apm=power-off vga=normal video=vesafb:off initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% nomce console=tty1 console=ttyS0,9600n8
label userdef
menu hide
label userdef
menu hide
diff --git
a/templates/boot/isolinux/netboot.cfg
b/templates/boot/isolinux/netboot.cfg
index
ecfb0b5
..
942b374
100644
(file)
--- a/
templates/boot/isolinux/netboot.cfg
+++ b/
templates/boot/isolinux/netboot.cfg
@@
-3,7
+3,7
@@
label grml
menu DEFAULT
menu label %GRML_NAME% ^Standard (%VERSION%, %ARCH%)
kernel linux26
menu DEFAULT
menu label %GRML_NAME% ^Standard (%VERSION%, %ARCH%)
kernel linux26
- append initrd=initrd.img root=/dev/nfs rw nfsroot=192.168.0.1:/live/image boot=live bootid=%BOOTID% apm=power-off
quiet
nomce noprompt noeject vga=791
+ append initrd=initrd.img root=/dev/nfs rw nfsroot=192.168.0.1:/live/image boot=live bootid=%BOOTID% apm=power-off nomce noprompt noeject vga=791
text help
Grml is a Debian based Linux live
text help
Grml is a Debian based Linux live