grub2: split up grub.cfg

as done in upstream live-build MR #135.

the intention here is to prepare to fix application of the theme for submenus,
as addressed next.

we could accomplish that just by the theme.cfg portion of the split, but why
not do the config.cfg bit also now. this is similar to how syslinux is broken
up, and a part of the live-build MR #135 changes are to merge config/bootloader
files on top of the default set, rather than use them instead, thus
user/derivative configs only need to carry the bootloader files they actually
want to replace. breaking up grub.cfg helps towards this, so eventually kali
can drop carrying files that are identical to upstream ilve-build's.
merge-requests/16/head
Lyndon Brown 5 years ago
parent 1826d94737
commit cce2cd88b6

@ -0,0 +1,16 @@
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
insmod png
source /boot/grub/theme.cfg
terminal_output gfxterm
insmod play
play 960 440 1 0 4 440 1

@ -1,31 +1,4 @@
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
insmod png
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
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
source /boot/grub/config.cfg
# Live boot
LINUX_LIVE

@ -0,0 +1,13 @@
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
set menu_color_normal=cyan/blue
set menu_color_highlight=white/blue
fi
Loading…
Cancel
Save