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

parse_isolinux: Support grub menuentry shortcuts for UEFI boot menus. 

Closes: #798908
This commit is contained in:
Steve McIntyre 2015-10-01 18:39:57 +01:00
parent c8730bbda5
commit 4816b4e0af
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/changelog vendored
View File

@ -20,6 +20,8 @@ debian-cd (3.1.18) UNRELEASED; urgency=medium
* Do similar for mips images, now r4k-ip22 cdrom images are no longer
built.
* Remove old obsolete pre-d-i function install_language and all callers.
* parse_isolinux: Support grub menuentry shortcuts for UEFI boot menus.
Closes: #798908
[ Didier Raboud ]
* For stretch, swap amd64 and i386 to let the first be the norm, and the

8
tools/boot/jessie/parse_isolinux
View File

@ -69,13 +69,17 @@ sub print_kernel {
my $t = shift;
my %k = %{$t};
my $initrd;
my $hotkey = "";
$k{"label"} =~ s/\^//;
if ($k{"label"} =~ m,\^(\S),) {
$hotkey = lc "--hotkey=$1 ";
$k{"label"} =~ s/\^//;
}
if ($k{"append"} =~ s? (initrd=\S+)??) {
$initrd = $1;
$initrd =~ s?^.*initrd=??;
}
print_indent "menuentry '$pre" . $k{"label"} . "' {\n";
print_indent "menuentry $hotkey'$pre" . $k{"label"} . "' {\n";
print_indent " set background_color=black\n";
print_indent " linux " . $k{"kernel"} . " " . $k{"append"} . "\n";
print_indent " initrd $initrd\n";

8
tools/boot/stretch/parse_isolinux
View File

@ -69,13 +69,17 @@ sub print_kernel {
my $t = shift;
my %k = %{$t};
my $initrd;
my $hotkey = "";
$k{"label"} =~ s/\^//;
if ($k{"label"} =~ m,\^(\S),) {
$hotkey = lc "--hotkey=$1 ";
$k{"label"} =~ s/\^//;
}
if ($k{"append"} =~ s? (initrd=\S+)??) {
$initrd = $1;
$initrd =~ s?^.*initrd=??;
}
print_indent "menuentry '$pre" . $k{"label"} . "' {\n";
print_indent "menuentry $hotkey'$pre" . $k{"label"} . "' {\n";
print_indent " set background_color=black\n";
print_indent " linux " . $k{"kernel"} . " " . $k{"append"} . "\n";
print_indent " initrd $initrd\n";