diff options
| author | Raphaël Hertzog <hertzog@debian.org> | 2016-11-22 18:17:53 +0100 |
|---|---|---|
| committer | Raphaël Hertzog <hertzog@debian.org> | 2016-11-28 20:58:18 +0100 |
| commit | 674794a8f4d61a729d2dbd6d99385d2826138694 (patch) | |
| tree | 0f00963a419ae00b7e83ae492081feb0a2062ae8 /scripts | |
| parent | 2f061569ac3b791216d8b137a51f084c993d2795 (diff) | |
| download | vyos-live-build-674794a8f4d61a729d2dbd6d99385d2826138694.tar.gz vyos-live-build-674794a8f4d61a729d2dbd6d99385d2826138694.zip | |
Try to reuse /isolinux/splash.png in default grub configuration.
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/build/binary_loopback_cfg | 17 | ||||
| -rwxr-xr-x | scripts/build/efi-image | 1 |
2 files changed, 5 insertions, 13 deletions
diff --git a/scripts/build/binary_loopback_cfg b/scripts/build/binary_loopback_cfg index 45e1aecac..52943dc44 100755 --- a/scripts/build/binary_loopback_cfg +++ b/scripts/build/binary_loopback_cfg @@ -105,13 +105,6 @@ Grub_live_autodetect_entry () LINUX_LIVE="${LINUX_LIVE}\n}" } -Grub_live_video () -{ - - LINUX_LIVE="${LINUX_LIVE}\ninsmod all_video\n" - -} - if [ -e "config/bootloaders/grub-pc" ] then # Internal local copy @@ -226,8 +219,6 @@ do done IFS="$OLDIFS" -Grub_live_video - if [ -z ${FOUND_SYSLINUX} ] then @@ -383,12 +374,12 @@ fi # Copying templates mkdir -p binary/boot/grub -cp "${_SOURCE}"/grub.cfg binary/boot/grub/grub.cfg +cp "${_SOURCE}"/* binary/boot/grub/ -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 +sed -i -e "s|LINUX_LIVE|${LINUX_LIVE}|" -e "s|LINUX_INSTALL|${LINUX_INSTALL}|" -e "s|MEMTEST|${MEMTEST}|" binary/boot/grub/*.cfg +sed -i -e "s#LB_BOOTAPPEND_INSTALL#${LB_BOOTAPPEND_INSTALL}#" -e "s#LB_BOOTAPPEND_LIVE#${LB_BOOTAPPEND_LIVE}#" binary/boot/grub/*.cfg -sed -i -e 's|\ $||g' binary/boot/grub/grub.cfg +sed -i -e 's|\ $||g' binary/boot/grub/*.cfg echo "source /boot/grub/grub.cfg" > binary/boot/grub/loopback.cfg diff --git a/scripts/build/efi-image b/scripts/build/efi-image index 724095f5c..c37232709 100755 --- a/scripts/build/efi-image +++ b/scripts/build/efi-image @@ -81,5 +81,6 @@ mcopy -i "$outdir/efi.img" "$workdir/boot$efi_name.efi" \ "::efi/boot/boot$efi_name.efi" grub-cpmodules "$outdir" "$platform" +cp /usr/share/grub/unicode.pf2 "$outdir/boot/grub/" exit 0 |