|
 |
752ceb1 |
From 226c5f786b48c5fc7692f18c99f526e8ac9a3702 Mon Sep 17 00:00:00 2001
|
|
|
f4c76c0 |
From: Fedora Ninjas <grub2-owner@fedoraproject.org>
|
|
|
f4c76c0 |
Date: Wed, 12 Feb 2014 14:54:04 -0500
|
|
|
752ceb1 |
Subject: [PATCH] Use the default device tree from the grub default file
|
|
|
f4c76c0 |
|
|
|
f4c76c0 |
instead of hardcoding a value.
|
|
|
f4c76c0 |
|
|
|
f4c76c0 |
Signed-off-by: David A. Marlin <dmarlin@redhat.com>
|
|
|
f4c76c0 |
---
|
|
|
f4c76c0 |
util/grub-mkconfig.in | 3 ++-
|
|
|
f4c76c0 |
util/grub.d/10_linux.in | 4 ++--
|
|
|
f4c76c0 |
2 files changed, 4 insertions(+), 3 deletions(-)
|
|
|
f4c76c0 |
|
|
|
f4c76c0 |
diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
|
|
|
752ceb1 |
index b0a8626dd1c..f68d4925ee6 100644
|
|
|
f4c76c0 |
--- a/util/grub-mkconfig.in
|
|
|
f4c76c0 |
+++ b/util/grub-mkconfig.in
|
|
|
752ceb1 |
@@ -254,7 +254,8 @@ export GRUB_DEFAULT \
|
|
|
f4c76c0 |
GRUB_ENABLE_CRYPTODISK \
|
|
|
f4c76c0 |
GRUB_BADRAM \
|
|
|
f4c76c0 |
GRUB_OS_PROBER_SKIP_LIST \
|
|
|
f4c76c0 |
- GRUB_DISABLE_SUBMENU
|
|
|
f4c76c0 |
+ GRUB_DISABLE_SUBMENU \
|
|
|
f4c76c0 |
+ GRUB_DEFAULT_DTB
|
|
|
f4c76c0 |
|
|
|
f4c76c0 |
if test "x${grub_cfg}" != "x"; then
|
|
|
f4c76c0 |
rm -f "${grub_cfg}.new"
|
|
|
f4c76c0 |
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
|
|
|
752ceb1 |
index 4e9a6308b3c..c548d989b2e 100644
|
|
|
f4c76c0 |
--- a/util/grub.d/10_linux.in
|
|
|
f4c76c0 |
+++ b/util/grub.d/10_linux.in
|
|
|
752ceb1 |
@@ -254,8 +254,8 @@ while [ "x$list" != "x" ] ; do
|
|
|
f4c76c0 |
|
|
|
f4c76c0 |
fdt=
|
|
|
f4c76c0 |
for i in "dtb-${version}" "dtb-${alt_version}"; do
|
|
|
f4c76c0 |
- if test -e "${dirname}/${i}/apm-mustang.dtb" ; then
|
|
|
f4c76c0 |
- fdt="${i}/apm-mustang.dtb"
|
|
|
f4c76c0 |
+ if test -f "${dirname}/${i}/${GRUB_DEFAULT_DTB}" ; then
|
|
|
f4c76c0 |
+ fdt="${i}/${GRUB_DEFAULT_DTB}"
|
|
|
f4c76c0 |
break
|
|
|
f4c76c0 |
fi
|
|
|
f4c76c0 |
done
|