suzanne.soy/nixpkgs
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

install-grub: only try to loadfont if font is not null

Browse Source
This commit is contained in:
Graham Christensen 2018-06-05 10:37:38 -04:00
parent 52de38f5f4
commit ab889c14b5
No known key found for this signature in database
GPG Key ID: ACA1C1D120C83D5C
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nixos/modules/system/boot/loader/grub/install-grub.pl
View File

@ -281,6 +281,11 @@ else {
else else
insmod vbe insmod vbe
fi fi
";
if ($font) {
copy $font, "$bootPath/converted-font.pf2" or die "cannot copy $font to $bootPath\n";
$conf .= "
insmod font insmod font
if loadfont " . $grubBoot->path . "/converted-font.pf2; then if loadfont " . $grubBoot->path . "/converted-font.pf2; then
insmod gfxterm insmod gfxterm
@ -294,9 +299,6 @@ else {
terminal_output gfxterm terminal_output gfxterm
fi fi
"; ";
if ($font) {
copy $font, "$bootPath/converted-font.pf2" or die "cannot copy $font to $bootPath\n";
} }
if ($splashImage) { if ($splashImage) {
# Keeps the image's extension. # Keeps the image's extension.