|
 |
16aa69 |
From 939f2d3dc981fe6a3258ac943673c43d7a4964a1 Mon Sep 17 00:00:00 2001
|
|
|
16aa69 |
From: no one <noone@example.com>
|
|
|
16aa69 |
Date: Thu, 13 Feb 2014 10:30:11 -0500
|
|
|
16aa69 |
Subject: [PATCH 08/41] Use the correct load commands for aarch64 efi.
|
|
|
16aa69 |
|
|
|
16aa69 |
Resolves: rhbz#1081269
|
|
|
16aa69 |
---
|
|
|
16aa69 |
grubby.c | 7 +++++++
|
|
|
16aa69 |
test.sh | 17 ++++++++++++++---
|
|
|
16aa69 |
2 files changed, 21 insertions(+), 3 deletions(-)
|
|
|
16aa69 |
|
|
|
16aa69 |
diff --git a/grubby.c b/grubby.c
|
|
|
16aa69 |
index aa228c3..0205882 100644
|
|
|
16aa69 |
--- a/grubby.c
|
|
|
16aa69 |
+++ b/grubby.c
|
|
|
16aa69 |
@@ -714,10 +714,17 @@ static enum lineType_e preferredLineType(enum lineType_e type,
|
|
|
16aa69 |
struct configFileInfo *cfi) {
|
|
|
16aa69 |
if (isEfi && cfi == &grub2ConfigType) {
|
|
|
16aa69 |
switch (type) {
|
|
|
16aa69 |
+#if defined(__aarch64__)
|
|
|
16aa69 |
+ case LT_KERNEL:
|
|
|
16aa69 |
+ return LT_KERNEL;
|
|
|
16aa69 |
+ case LT_INITRD:
|
|
|
16aa69 |
+ return LT_INITRD;
|
|
|
16aa69 |
+#else
|
|
|
16aa69 |
case LT_KERNEL:
|
|
|
16aa69 |
return LT_KERNEL_EFI;
|
|
|
16aa69 |
case LT_INITRD:
|
|
|
16aa69 |
return LT_INITRD_EFI;
|
|
|
16aa69 |
+#endif
|
|
|
16aa69 |
default:
|
|
|
16aa69 |
return type;
|
|
|
16aa69 |
}
|
|
|
16aa69 |
diff --git a/test.sh b/test.sh
|
|
|
16aa69 |
index 5be4006..1d28fb1 100755
|
|
|
16aa69 |
--- a/test.sh
|
|
|
16aa69 |
+++ b/test.sh
|
|
|
16aa69 |
@@ -443,9 +443,20 @@ if [ "$testgrub2" == "y" ]; then
|
|
|
16aa69 |
grub2Test grub2.1 add/g2-1.1 --add-kernel=/boot/new-kernel.img \
|
|
|
16aa69 |
--title='title' --initrd=/boot/new-initrd --boot-filesystem=/boot/ \
|
|
|
16aa69 |
--copy-default
|
|
|
16aa69 |
- grub2Test grub2.1 add/g2-1.6 --add-kernel=/boot/new-kernel.img \
|
|
|
16aa69 |
- --title='title' --initrd=/boot/new-initrd --boot-filesystem=/boot/ \
|
|
|
16aa69 |
- --copy-default --efi
|
|
|
16aa69 |
+ case $ARCH in
|
|
|
16aa69 |
+ aarch64)
|
|
|
16aa69 |
+ grub2Test grub2.1 add/g2-1.1 --add-kernel=/boot/new-kernel.img \
|
|
|
16aa69 |
+ --title='title' \
|
|
|
16aa69 |
+ --initrd=/boot/new-initrd --boot-filesystem=/boot/ \
|
|
|
16aa69 |
+ --copy-default --efi
|
|
|
16aa69 |
+ ;;
|
|
|
16aa69 |
+ *)
|
|
|
16aa69 |
+ grub2Test grub2.1 add/g2-1.6 --add-kernel=/boot/new-kernel.img \
|
|
|
16aa69 |
+ --title='title' \
|
|
|
16aa69 |
+ --initrd=/boot/new-initrd --boot-filesystem=/boot/ \
|
|
|
16aa69 |
+ --copy-default --efi
|
|
|
16aa69 |
+ ;;
|
|
|
16aa69 |
+ esac
|
|
|
16aa69 |
grub2Test grub2.6 add/g2-1.7 --add-kernel=/boot/new-kernel.img \
|
|
|
16aa69 |
--title='title' --initrd=/boot/new-initrd --boot-filesystem=/boot/ \
|
|
|
16aa69 |
--copy-default --efi
|
|
|
16aa69 |
--
|
|
|
16aa69 |
2.4.3
|
|
|
16aa69 |
|