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

Merge branch 'sthibault/debian-cd-master'

This commit is contained in:
Steve McIntyre 2019-02-11 16:50:01 +00:00
parent 44ea4bc0e3 3a588e90a5
commit dca9045c6d
2 changed files with 28 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
debian/changelog vendored
View File

@ -11,6 +11,9 @@ debian-cd (3.1.23) UNRELEASED; urgency=medium
[ Steve McIntyre ] [ Steve McIntyre ]
* Add grub-efi packages to armhf media * Add grub-efi packages to armhf media
[ Samuel Thibault ]
* Support dark theme boot entries.
-- Holger Levsen <holger@debian.org> Thu, 07 Feb 2019 15:53:42 +0100 -- Holger Levsen <holger@debian.org> Thu, 07 Feb 2019 15:53:42 +0100
debian-cd (3.1.22) unstable; urgency=medium debian-cd (3.1.22) unstable; urgency=medium

28
tools/boot/buster/parse_isolinux
View File

@ -137,6 +137,14 @@ sub create_theme_file {
} }
close(IN); close(IN);
close(OUT); close(OUT);
open(IN, "<", "$theme_dir/$filename");
open(OUT, ">", "$theme_dir/dark-$filename");
while (<IN>) {
next if ($_ =~ /^desktop-image:/);
print OUT "$_";
}
close(IN);
close(OUT);
} }
make_path($theme_dir); make_path($theme_dir);
@ -152,6 +160,7 @@ $menu_title[$menudepth] = $menu{"title"};
my %kernel; my %kernel;
my $in_kernel = 0; my $in_kernel = 0;
my $in_dark = 0;
my $new_menu = 0; my $new_menu = 0;
$menudepth++; $menudepth++;
@ -172,6 +181,9 @@ foreach my $line(@lines) {
} }
$menu{"number"} = $mn_string; $menu{"number"} = $mn_string;
$menu{"label"} = $1; $menu{"label"} = $1;
if ($menu{"label"} eq "dark") {
$in_dark = 1;
}
if ($in_kernel) { if ($in_kernel) {
print_kernel(\%kernel); print_kernel(\%kernel);
undef %kernel; undef %kernel;
@ -192,6 +204,7 @@ foreach my $line(@lines) {
$pre = "... "; $pre = "... ";
} else { } else {
$pre = ""; $pre = "";
$in_dark = 0;
} }
} elsif ($line =~ /^\s*menu title (.*$)/) { } elsif ($line =~ /^\s*menu title (.*$)/) {
if ($in_kernel) { if ($in_kernel) {
@ -215,9 +228,18 @@ foreach my $line(@lines) {
$pre = ""; $pre = "";
} }
debug(); debug();
print_indent "set menu_color_normal=cyan/blue\n"; if ($in_dark) {
print_indent "set menu_color_highlight=white/blue\n"; print_indent "set menu_color_normal=white/black\n";
print_indent "set theme=/boot/grub/theme/" . $menu{"number"} . "\n"; print_indent "set menu_color_highlight=yellow/black\n";
print_indent "set color_normal=white/black\n";
print_indent "set color_highlight=yellow/black\n";
print_indent "background_image\n";
print_indent "set theme=/boot/grub/theme/dark-" . $menu{"number"} . "\n";
} else {
print_indent "set menu_color_normal=cyan/blue\n";
print_indent "set menu_color_highlight=white/blue\n";
print_indent "set theme=/boot/grub/theme/" . $menu{"number"} . "\n";
}
create_theme_file($menu{"number"}); create_theme_file($menu{"number"});
$new_menu = 0; $new_menu = 0;
} }