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