Use a grub theme that integrates reasonably well with the current background picture.

This commit is contained in:
Raphaël Hertzog 2016-11-29 18:18:01 +01:00
parent e1941f82ab
commit fb0d4e2a18
8 changed files with 75 additions and 10 deletions

2
debian/changelog vendored
View File

@ -38,6 +38,8 @@ live-build (1:20161128) UNRELEASED; urgency=medium
for the report. Closes: #774807
* Bump debhelper compat level to 10.
* Bump Standards-Version to 3.9.8.
* Use a grub theme that integrates reasonably well with the current
background picture.
[ Kristian Klausen ]
* Include ext{3,4} journal size when calculating image size. Closes: #801712

View File

@ -308,6 +308,13 @@ then
rm -f "${_TARGET}/splash.svg"
fi
# Tweak the grub theme to reuse the syslinux background image
if [ -e binary/boot/grub/live-theme/theme.txt ]; then
sed -i -e 's|^desktop-image:.*|desktop-image: "/isolinux/splash.png"|' \
-e 's|^title-text:.*|title-text: ""|' \
binary/boot/grub/live-theme/theme.txt
fi
case "${LB_MODE}" in
progress-linux)
for _FILE in "${_TARGET}/isolinux.bin" "${_TARGET}/isolinux.cfg" "${_TARGET}/syslinux.cfg"

Binary file not shown.

Binary file not shown.

View File

@ -1,24 +1,29 @@
set default=0
loadfont $prefix/dejavu-bold-16.pf2
loadfont $prefix/dejavu-bold-14.pf2
loadfont $prefix/unicode.pf2
set gfxmode=auto
insmod all_video
insmod gfxterm
terminal_output gfxterm
insmod png
insmod tga
if [ -e /isolinux/splash.png ] ; then
background_image /isolinux/splash.png
set color_normal=light-gray/black
set color_highlight=white/black
set color_normal=light-gray/black
set color_highlight=white/black
if [ -e /isolinux/splash.png ]; then
# binary_syslinux modifies the theme file to point to the correct
# background picture
set theme=/boot/grub/live-theme/theme.txt
elif [ -e /boot/grub/splash.png ]; then
set theme=/boot/grub/live-theme/theme.txt
else
background_image /boot/grub/splash.tga
set menu_color_normal=cyan/blue
set menu_color_highlight=white/blue
set menu_color_normal=cyan/blue
set menu_color_highlight=white/blue
fi
terminal_output gfxterm
insmod play
play 960 440 1 0 4 440 1

View File

@ -0,0 +1,51 @@
desktop-image: "../splash.png"
title-color: "#ffffff"
title-font: "DejaVu Sans Bold 16"
title-text: "Live Boot Menu with GRUB"
message-font: "Unifont Regular 16"
terminal-font: "Unifont Regular 16"
#help bar at the bottom
+ label {
top = 100%-50
left = 0
width = 100%
height = 20
text = "@KEYMAP_SHORT@"
align = "center"
color = "#ffffff"
font = "DejaVu Sans Bold 14"
}
#boot menu
+ boot_menu {
left = 10%
width = 80%
top = 52%
height = 48%-80
item_color = "#a8a8a8"
item_font = "DejaVu Sans Bold 14"
selected_item_color= "#ffffff"
selected_item_font = "DejaVu Sans Bold 14"
item_height = 16
item_padding = 0
item_spacing = 4
icon_width = 0
icon_heigh = 0
item_icon_space = 0
}
#progress bar
+ progress_bar {
id = "__timeout__"
left = 15%
top = 100%-80
height = 16
width = 70%
font = "DejaVu Sans Regular 14"
text_color = "#000000"
fg_color = "#ffffff"
bg_color = "#a8a8a8"
border_color = "#ffffff"
text = "@TIMEOUT_NOTIFICATION_LONG@"
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.