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