mirror of
https://src.fedoraproject.org/rpms/grub2.git
synced 2024-11-28 07:44:52 +00:00
5e72956199
This reverts commit 93004a8494,
because it broke Rawhide. It also tries to fixes BLS ostree
detection to work in chroots (e.g. during installation) by also
checking for /ostree/repo.
30 lines
1.3 KiB
Diff
30 lines
1.3 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: fluteze <fluteze@gmail.com>
|
|
Date: Sat, 27 Nov 2021 10:54:44 -0600
|
|
Subject: [PATCH] Add Fedora location of DejaVu SANS font
|
|
|
|
In Fedora 35, and possibly earlier, grub would fail to configure with a
|
|
complaint about DejaVu being "not found" even though it was installed.
|
|
The DejaVu sans font search path is updated to reflect the
|
|
distribution's current install path.
|
|
|
|
Signed-off-by: Erik Edwards <fluteze@gmail.com>
|
|
[rharwood@redhat.com: slight commit message edits]
|
|
Signed-off-by: Robbie Harwood <rharwood@redhat.com>
|
|
---
|
|
configure.ac | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
index 3c808a72230..3527f069ab2 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -1812,7 +1812,7 @@ fi
|
|
|
|
if test x"$starfield_excuse" = x; then
|
|
for ext in pcf pcf.gz bdf bdf.gz ttf ttf.gz; do
|
|
- for dir in . /usr/src /usr/share/fonts/X11/misc /usr/share/fonts/truetype/ttf-dejavu /usr/share/fonts/dejavu /usr/share/fonts/truetype; do
|
|
+ for dir in . /usr/src /usr/share/fonts/X11/misc /usr/share/fonts/truetype/ttf-dejavu /usr/share/fonts/dejavu /usr/share/fonts/truetype /usr/share/fonts/dejavu-sans-fonts; do
|
|
if test -f "$dir/DejaVuSans.$ext"; then
|
|
DJVU_FONT_SOURCE="$dir/DejaVuSans.$ext"
|
|
break 2
|