diff options
| author | Daniel Baumann <mail@daniel-baumann.ch> | 2015-02-07 06:56:34 +0100 |
|---|---|---|
| committer | Daniel Baumann <mail@daniel-baumann.ch> | 2015-02-07 06:56:34 +0100 |
| commit | 319866567a5b4de45a80666fdbb8d00426f205bf (patch) | |
| tree | d9182660b5453f9e9141c86f1f3eb5cc5fd38f18 | |
| parent | 0c94983071ad4800961df4a1707add9f612faa5c (diff) | |
| download | vyos-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).
| -rwxr-xr-x | scripts/build/binary_grub2 | 4 | ||||
| -rwxr-xr-x | 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 |