summaryrefslogtreecommitdiff
path: root/scripts/build/binary_grub2
diff options
context:
space:
mode:
authorDaniel Baumann <mail@daniel-baumann.ch>2015-02-07 06:56:34 +0100
committerDaniel Baumann <mail@daniel-baumann.ch>2015-02-07 06:56:34 +0100
commit319866567a5b4de45a80666fdbb8d00426f205bf (patch)
treed9182660b5453f9e9141c86f1f3eb5cc5fd38f18 /scripts/build/binary_grub2
parent0c94983071ad4800961df4a1707add9f612faa5c (diff)
downloadvyos-live-build-319866567a5b4de45a80666fdbb8d00426f205bf.tar.gz
vyos-live-build-319866567a5b4de45a80666fdbb8d00426f205bf.zip
Applying patch from jnqnfe <jnqnfe@gmail.com> to correct grub2 bootloader directory within the binary images (Closes: #775316).
Diffstat (limited to 'scripts/build/binary_grub2')
-rwxr-xr-xscripts/build/binary_grub24
1 files changed, 2 insertions, 2 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