From 319866567a5b4de45a80666fdbb8d00426f205bf Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sat, 7 Feb 2015 06:56:34 +0100 Subject: [PATCH] Applying patch from jnqnfe to correct grub2 bootloader directory within the binary images (Closes: #775316). --- scripts/build/binary_grub2 | 4 ++-- scripts/build/binary_iso | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/build/binary_grub2 b/scripts/build/binary_grub2 index d204a3e35..61f5dc6e0 100755 --- a/scripts/build/binary_grub2 +++ b/scripts/build/binary_grub2 @@ -210,7 +210,7 @@ then fi # Copying templates -mkdir -p binary/boot/grub +mkdir -p binary/boot/grub/i386-pc cp -r "${TEMPLATES}"/* binary/boot/grub case ${LIVE_IMAGE_TYPE} in @@ -229,7 +229,7 @@ then fi # Copying grub -cp ${FILES} binary/boot/grub +cp ${FILES} binary/boot/grub/i386-pc sed -i -e "s|LINUX_LIVE|${LINUX_LIVE}|" -e "s|LINUX_INSTALL|${LINUX_INSTALL}|" -e "s|MEMTEST|${MEMTEST}|" binary/boot/grub/grub.cfg sed -i -e "s#LB_BOOTAPPEND_INSTALL#${LB_BOOTAPPEND_INSTALL}#" -e "s#LB_BOOTAPPEND_LIVE#${LB_BOOTAPPEND_LIVE}#" binary/boot/grub/grub.cfg diff --git a/scripts/build/binary_iso b/scripts/build/binary_iso index 4286bc9ee..44a9418c8 100755 --- a/scripts/build/binary_iso +++ b/scripts/build/binary_iso @@ -172,7 +172,7 @@ for file in \${input_dir}/*.mod \${input_dir}/efiemu??.o \ do if test -f "\$file" then - cp -f "\$file" binary/boot/grub + cp -f "\$file" binary/boot/grub/i386-pc fi done EOF -- 2.11.4.GIT