From 4fb58cfefc54b82eb48801ef111c461f6e510369 Mon Sep 17 00:00:00 2001
From: Christopher Spinrath <christopher.spinrath@rwth-aachen.de>
Date: Sat, 29 Aug 2015 17:43:47 +0200
Subject: [PATCH] image:grub: set prefix to /grub to avoid conflicts
with the ubuntu secure boot grub located in /boot/grub.
---
Makefile | 2 +-
contrib/image/grub_early.cfg | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index 1d75f73..32b901b 100644
--- a/Makefile
+++ b/Makefile
@@ -395,7 +395,7 @@ $(GRUB_ASSEMBLE_DIR)/grub.x86_64-efi $(GRUB_ASSEMBLE_DIR)/grub.i386-efi : $(GRUB
image_grub_mkimage_mbr: $(GRUB_ASSEMBLE_DIR)/grub.i386-pc
$(GRUB_ASSEMBLE_DIR)/grub.i386-pc : | $(WORKSPACE)
mkdir -p "$(GRUB_ASSEMBLE_DIR)"
- grub-mkimage --prefix "(hd0,msdos1)/boot/grub" \
+ grub-mkimage --prefix "(hd0,msdos1)/grub" \
--output "$@" --format "i386-pc" \
$(IMAGE_GRUB_MBR_MODULES)
diff --git a/contrib/image/grub_early.cfg b/contrib/image/grub_early.cfg
index 3f3cb27..dd79458 100644
--- a/contrib/image/grub_early.cfg
+++ b/contrib/image/grub_early.cfg
@@ -1,7 +1,7 @@
if [ -z "$prefix" -o ! -e "$prefix" ]; then
if ! search --file --set=root /.disk/info; then
search --file --set=root /.disk/mini-info
- set prefix=($root)/boot/grub
+ set prefix=($root)/grub
if [ -e $prefix/x86_64-efi/grub.cfg ]; then
source $prefix/x86_64-efi/grub.cfg
else
--
GitLab