Peppermint
/
debian-cd-clone
mirror of https://salsa.debian.org/images-team/debian-cd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add support for grub submenu hotkeys

This commit is contained in:
Samuel Thibault 2017-03-29 02:48:12 +02:00
parent a3aef842ad
commit 5946c6ef32
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
debian/changelog vendored
View File

@ -8,6 +8,9 @@ debian-cd (3.1.20) UNRELEASED; urgency=medium
* Add https bits to tools/generate_di+k_list (#855035) * Add https bits to tools/generate_di+k_list (#855035)
* Fix missing full path for cztz call in tools/grab_md5 (Closes: #855174) * Fix missing full path for cztz call in tools/grab_md5 (Closes: #855174)
[ Samuel Thibault ]
* Add support for grub submenu hotkeys.
-- Raphaël Hertzog <hertzog@debian.org> Fri, 27 Jan 2017 13:59:40 +0100 -- Raphaël Hertzog <hertzog@debian.org> Fri, 27 Jan 2017 13:59:40 +0100
debian-cd (3.1.19) unstable; urgency=medium debian-cd (3.1.19) unstable; urgency=medium

9
tools/boot/stretch/parse_isolinux
View File

@ -199,7 +199,12 @@ foreach my $line(@lines) {
} }
$menu{"title"} = $1; $menu{"title"} = $1;
if ($new_menu) { if ($new_menu) {
print_indent "submenu '$pre" . $menu{"title"} . " ...' {\n"; my $hotkey = "";
if ($menu{"label"} =~ m,\^(\S),) {
$hotkey = lc "--hotkey=$1 ";
$menu{"label"} =~ s/\^//;
}
print_indent "submenu $hotkey'$pre" . $menu{"label"} . " ...' {\n";
$menu_title[$menudepth] = $menu{"title"}; $menu_title[$menudepth] = $menu{"title"};
$menudepth++; $menudepth++;
if ($menudepth > 1) { if ($menudepth > 1) {
@ -223,6 +228,8 @@ foreach my $line(@lines) {
$in_kernel = 1; $in_kernel = 1;
} elsif ($line =~ /menu label (.*)$/ && $in_kernel) { } elsif ($line =~ /menu label (.*)$/ && $in_kernel) {
$kernel{"label"} = $1; $kernel{"label"} = $1;
} elsif ($line =~ /menu label (.*)$/) {
$menu{"label"} = $1;
} elsif ($line =~ /menu default/ && $in_kernel) { } elsif ($line =~ /menu default/ && $in_kernel) {
$kernel{"default"} = 1; $kernel{"default"} = 1;
} elsif ($line =~ /kernel (.*)$/ && $in_kernel) { } elsif ($line =~ /kernel (.*)$/ && $in_kernel) {