Skip to content

Commit

Permalink
Remove Grml release name from the boot options
Browse files Browse the repository at this point in the history 
The Grml release name is shown on top of the additional boot option menu
and also in front of every boot option.
This limits the readable title length. We decided to remove it.

Changed "German Settings" to "Load German Keyboard Layout" because that
is what it does (i.e. it runs `grml-lang de`).

Also changed the description of some entries as they were cut off, on the
boot screen.
Closes: grml/grml#10
  • Loading branch information
@jkirk
jkirk committed Dec 7, 2023
1 parent cbbab37 commit 4e76a27
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 31 deletions.
24 changes: 12 additions & 12 deletions templates/boot/grub/%SHORT_NAME%_options.cfg
View file
Original file line number Diff line number Diff line change
@@ -1,93 +1,93 @@
submenu "%GRML_NAME% - advanced options ->" --class=submenu {
menuentry "%GRML_NAME% - Enable Predictable Network Interface Names" {
menuentry "Enable Predictable Network Interface Names" {
set gfxpayload=keep
echo 'Loading kernel...'
linux /boot/%SHORT_NAME%/vmlinuz apm=power-off boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% nomce "${loopback}" ${kernelopts}
echo 'Loading initrd...'
initrd /boot/%SHORT_NAME%/initrd.img
}

menuentry "%GRML_NAME% - Enable SSH (with random password)" {
menuentry "Enable SSH (with random password)" {
set gfxpayload=keep
echo 'Loading kernel...'
linux /boot/%SHORT_NAME%/vmlinuz apm=power-off boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% nomce net.ifnames=0 "${loopback}" ${kernelopts} ssh
echo 'Loading initrd...'
initrd /boot/%SHORT_NAME%/initrd.img
}

menuentry "%GRML_NAME% - Load Grml to RAM" {
menuentry "Load Grml to RAM" {
set gfxpayload=keep
echo 'Loading kernel...'
linux /boot/%SHORT_NAME%/vmlinuz apm=power-off boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% nomce net.ifnames=0 "${loopback}" ${kernelopts} toram=%GRML_NAME%.squashfs
echo 'Loading initrd...'
initrd /boot/%SHORT_NAME%/initrd.img
}

menuentry "%GRML_NAME% - Load whole medium to RAM" {
menuentry "Load whole medium to RAM" {
set gfxpayload=keep
echo 'Loading kernel...'
linux /boot/%SHORT_NAME%/vmlinuz apm=power-off boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% nomce net.ifnames=0 "${loopback}" ${kernelopts} toram
echo 'Loading initrd...'
initrd /boot/%SHORT_NAME%/initrd.img
}

menuentry "%GRML_NAME% - Forensic Mode" {
menuentry "Forensic Mode" {
set gfxpayload=keep
echo 'Loading kernel...'
linux /boot/%SHORT_NAME%/vmlinuz apm=power-off boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% nomce net.ifnames=0 "${loopback}" ${kernelopts} read-only nofstab noraid nodmraid nolvm noautoconfig noswap raid=noautodetect
echo 'Loading initrd...'
initrd /boot/%SHORT_NAME%/initrd.img
}

menuentry "%GRML_NAME% - Persistency Mode" {
menuentry "Persistency Mode" {
set gfxpayload=keep
echo 'Loading kernel...'
linux /boot/%SHORT_NAME%/vmlinuz apm=power-off boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% nomce net.ifnames=0 "${loopback}" ${kernelopts} persistence
echo 'Loading initrd...'
initrd /boot/%SHORT_NAME%/initrd.img
}

menuentry "%GRML_NAME% - German Settings" {
menuentry "Load German Keyboard Layout" {
set gfxpayload=keep
echo 'Loading kernel...'
linux /boot/%SHORT_NAME%/vmlinuz apm=power-off boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% nomce net.ifnames=0 "${loopback}" ${kernelopts} lang=de
echo 'Loading initrd...'
initrd /boot/%SHORT_NAME%/initrd.img
}

menuentry "%GRML_NAME% - Graphical Mode" {
menuentry "Graphical Mode" {
set gfxpayload=keep
echo 'Loading kernel...'
linux /boot/%SHORT_NAME%/vmlinuz apm=power-off boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% nomce net.ifnames=0 "${loopback}" ${kernelopts} startx
echo 'Loading initrd...'
initrd /boot/%SHORT_NAME%/initrd.img
}

menuentry "%GRML_NAME% - Disable Framebuffer" {
menuentry "Disable Framebuffer" {
set gfxpayload=text
echo 'Loading kernel...'
linux /boot/%SHORT_NAME%/vmlinuz apm=power-off boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% nomce net.ifnames=0 "${loopback}" ${kernelopts} video=ofonly radeon.modeset=0 i915.modeset=0 nouveau.modeset=0 cirrus.modeset=0 mgag200.modeset=0 nomodeset
echo 'Loading initrd...'
initrd /boot/%SHORT_NAME%/initrd.img
}

menuentry "%GRML_NAME% - Disable Kernel Mode-Setting" {
menuentry "Disable Video Kernel Mode Setting" {
set gfxpayload=keep
echo 'Loading kernel...'
linux /boot/%SHORT_NAME%/vmlinuz apm=power-off boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% nomce net.ifnames=0 "${loopback}" ${kernelopts} radeon.modeset=0 i915.modeset=0 nouveau.modeset=0 cirrus.modeset=0 mgag200.modeset=0 nomodeset
echo 'Loading initrd...'
initrd /boot/%SHORT_NAME%/initrd.img
}

menuentry "%GRML_NAME% - Debug Mode" {
menuentry "Debug Mode" {
set gfxpayload=keep
echo 'Loading kernel...'
linux /boot/%SHORT_NAME%/vmlinuz apm=power-off boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% nomce net.ifnames=0 "${loopback}" ${kernelopts} initcall verbose debug=vc systemd.log_level=debug systemd.log_target=kmsg log_buf_len=1M
echo 'Loading initrd...'
initrd /boot/%SHORT_NAME%/initrd.img
}

menuentry "%GRML_NAME% - Serial Console" {
menuentry "Serial Console" {
set gfxpayload=text
echo 'Loading kernel...'
linux /boot/%SHORT_NAME%/vmlinuz apm=power-off boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% nomce net.ifnames=0 "${loopback}" ${kernelopts} video=vesafb:off console=tty1 console=ttyS0,115200n8
Expand Down
38 changes: 19 additions & 19 deletions templates/boot/isolinux/grml.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@
# generic ones

label pnet
menu label %GRML_NAME% - Enable Predictable ^Network Interface Names
menu label Enable Predictable ^Network Interface Names
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=791 nomce

text help
Boot Grml with Predictable
Network Interface Names.
Boot Grml with Predictable Network
Interface Names.
endtext

label ssh
menu label %GRML_NAME% - Enable ^SSH (with random password)
menu label Enable ^SSH (with random password)
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=791 nomce net.ifnames=0 ssh

Expand All @@ -28,12 +28,12 @@ label ssh
endtext

label grml2ram
menu label %GRML_NAME% - Load Grml to ^RAM
menu label Load Grml to ^RAM
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=791 nomce net.ifnames=0 toram=%SQUASHFS_NAME%

text help
Load Grml into the memory (RAM).
Load Grml into RAM.
This allows you to remove the Grml
media after Grml finished booting.

Expand All @@ -43,12 +43,12 @@ label grml2ram
endtext

label grmlmedium2ram
menu label %GRML_NAME% - Load ^whole medium to RAM
menu label Load ^whole medium to RAM
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=791 nomce net.ifnames=0 toram

text help
Load whole medium into the memory (RAM).
Load whole medium into RAM.
This allows you to remove the Grml
media after Grml has finished booting,
and also to access the rest of the
Expand All @@ -60,7 +60,7 @@ label grmlmedium2ram
endtext

label forensic
menu label %GRML_NAME% - F^orensic Mode
menu label F^orensic Mode
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 nomce net.ifnames=0 vga=791 nofstab noraid nodmraid nolvm noautoconfig noswap raid=noautodetect read-only

Expand All @@ -73,7 +73,7 @@ label forensic
endtext

label persistence
menu label %GRML_NAME% - ^Persistency mode
menu label ^Persistency mode
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=791 nomce net.ifnames=0 persistence

Expand All @@ -85,16 +85,16 @@ label persistence
endtext

label lang-de
menu label %GRML_NAME% - ^German Settings
menu label Load ^German Keyboard Layout
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=791 nomce net.ifnames=0 lang=de

text help
Boot Grml with german settings.
Boot Grml with German keyboard layout.
endtext

label %GRML_NAME%x
menu label %GRML_NAME% - Graphical ^Mode
menu label Graphical ^Mode
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=791 nomce net.ifnames=0 startx

Expand All @@ -104,7 +104,7 @@ label %GRML_NAME%x
endtext

label nofb
menu label %GRML_NAME% - Dis^able Framebuffer
menu label 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 cirrus.modeset=0 mgag200.modeset=0 nomodeset nomce net.ifnames=0

Expand All @@ -113,17 +113,17 @@ label nofb
endtext

label nokms
menu label %GRML_NAME% - Disable ^Kernel Mode-Setting
menu label Disable Video ^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 cirrus.modeset=0 mgag200.modeset=0 nomodeset nomce net.ifnames=0 vga=791

text help
Boot Grml without KMS (Kernel
Mode Setting).
Boot Grml without Kernel Mode Setting
for various video drivers.
endtext

label debug
menu label %GRML_NAME% - ^Debug Mode
menu label ^Debug Mode
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=791 verbose debug=vc initcall nomce net.ifnames=0 systemd.log_level=debug systemd.log_target=kmsg log_buf_len=1M

Expand All @@ -134,7 +134,7 @@ label debug
endtext

label serial
menu label %GRML_NAME% - Serial ^Console
menu label Serial ^Console
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 video=vesafb:off nomce net.ifnames=0 console=tty1 console=ttyS0,115200n8

Expand Down

0 comments on commit 4e76a27

Please sign in to comment.