From 46de5bb96c18eb65167f095aa6e23518b8bed8be Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 22 Oct 2012 20:34:10 +0200 Subject: Removing support for local grub/grub2 splash image and config manipulations, custom templates should be used instead. Rather than doing all the heavy lifting in live-build that nobody really uses and which is quite inflexible, users should (in line with the syslinux handling) either stick with the default grub configurations, or, supply a custom one to live-build, rather than partial/single files only. --- scripts/build/binary_grub2 | 28 ---------------------------- 1 file changed, 28 deletions(-) (limited to 'scripts/build/binary_grub2') diff --git a/scripts/build/binary_grub2 b/scripts/build/binary_grub2 index 738f28006..ce1d15359 100755 --- a/scripts/build/binary_grub2 +++ b/scripts/build/binary_grub2 @@ -236,34 +236,6 @@ fi # Copying grub cp ${FILES} binary/boot/grub -# Copying local configuration file -if [ -f config/binary_grub/grub.cfg ] -then - cp config/binary_grub/grub.cfg binary/boot/grub/grub.cfg -fi - -# Copying splash screen -if [ -f config/binary_grub/splash.tga ] -then - LB_GRUB_SPLASH="config/binary_grub/splash.tga" -fi - -if [ -n "${LB_GRUB_SPLASH}" ] -then - if [ "${LB_GRUB_SPLASH}" = "none" ] - then - # Removing splash file - rm -f binary/boot/grub/splash.tga - - # Removing splash entry - sed -i -e "s|background_image.*||" binary/boot/grub/grub.cfg - else - # Overwriting splash file - cp -f "${LB_GRUB_SPLASH}" binary/boot/grub - sed -i -e "s|background_image .*.tga|background_image \$\(root\)/boot/grub/$(basename ${LB_GRUB_SPLASH})|" binary/boot/grub/grub.cfg - fi -fi - 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 -- cgit v1.2.3