dcavalca / rpms / grub2

Forked from rpms/grub2 3 years ago
Clone

Blame SOURCES/0137-Use-the-default-device-tree-from-the-grub-default-fi.patch

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