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
Backport from unstable.
This commit is contained in:
Steve McIntyre 2015-10-02 23:51:17 +01:00
parent aeb8a31421
commit 85e8e44ba8
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/changelog vendored
View File

@ -12,6 +12,8 @@ debian-cd (3.1.17-jessie) UNRELEASED; urgency=medium
+ tools/boot/jessie/boot-arm: Add kernels and other bits to + tools/boot/jessie/boot-arm: Add kernels and other bits to
armel/armhf images armel/armhf images
+ Check for file size on update CD/DVD generation + Check for file size on update CD/DVD generation
+ parse_isolinux: Support grub menuentry shortcuts for UEFI boot menus.
Closes: #798908
-- Steve McIntyre <93sam@debian.org> Mon, 20 Apr 2015 12:36:57 +0100 -- Steve McIntyre <93sam@debian.org> Mon, 20 Apr 2015 12:36:57 +0100

8
tools/boot/jessie/parse_isolinux
View File

@ -69,13 +69,17 @@ sub print_kernel {
my $t = shift; my $t = shift;
my %k = %{$t}; my %k = %{$t};
my $initrd; 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+)??) { if ($k{"append"} =~ s? (initrd=\S+)??) {
$initrd = $1; $initrd = $1;
$initrd =~ s?^.*initrd=??; $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 " set background_color=black\n";
print_indent " linux " . $k{"kernel"} . " " . $k{"append"} . "\n"; print_indent " linux " . $k{"kernel"} . " " . $k{"append"} . "\n";
print_indent " initrd $initrd\n"; print_indent " initrd $initrd\n";