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

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