diff options
| author | Daniel Baumann <daniel@debian.org> | 2012-10-22 20:34:10 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2012-10-22 20:34:14 +0200 |
| commit | 46de5bb96c18eb65167f095aa6e23518b8bed8be (patch) | |
| tree | e3c1261cc4b4d8dd13ee61035d6c3cbdabc1cc0a | |
| parent | bd5f6bc104b5a875a417c6b90c8c9755b356d594 (diff) | |
| download | vyos-live-build-46de5bb96c18eb65167f095aa6e23518b8bed8be.tar.gz vyos-live-build-46de5bb96c18eb65167f095aa6e23518b8bed8be.zip | |
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.
| -rwxr-xr-x | scripts/build/binary_grub | 31 | ||||
| -rwxr-xr-x | scripts/build/binary_grub2 | 28 | ||||
| -rwxr-xr-x | scripts/build/config | 1 |
3 files changed, 0 insertions, 60 deletions
diff --git a/scripts/build/binary_grub b/scripts/build/binary_grub index 1dd1201e7..af637229c 100755 --- a/scripts/build/binary_grub +++ b/scripts/build/binary_grub @@ -263,37 +263,6 @@ fi # Copying grub cp ${FILES} binary/boot/grub -# Copying local configuration file -if [ -f config/binary_grub/menu.lst ] -then - cp config/binary_grub/menu.lst binary/boot/grub/menu.lst -fi - -# Copying splash screen -if [ -f config/binary_grub/splash.xpm.gz ] -then - LB_GRUB_SPLASH="config/binary_grub/splash.xpm.gz" -elif [ -f config/binary_grub/splash.xpm ] -then - LB_GRUB_SPLASH="config/binary_grub/splash.xpm" -fi - -if [ -n "${LB_GRUB_SPLASH}" ] -then - if [ "${LB_GRUB_SPLASH}" = "none" ] - then - # Removing splash file - rm -f binary/boot/grub/splash.xpm.gz - - # Removing splash entry - sed -i -e "s|splashimage.*||" binary/boot/grub/menu.lst - else - # Overwriting splash file - cp -f "${LB_GRUB_SPLASH}" binary/boot/grub - sed -i -e "s|splashimage.*|splashimage /boot/grub/$(basename ${LB_GRUB_SPLASH})|" binary/boot/grub/menu.lst - fi -fi - sed -i -e "s|LINUX_LIVE|${LINUX_LIVE}|" -e "s|LINUX_INSTALL|${LINUX_INSTALL}|" -e "s|MEMTEST|${MEMTEST}|" binary/boot/grub/menu.lst sed -i -e "s|LB_BOOTAPPEND_INSTALL|${LB_BOOTAPPEND_INSTALL}|" -e "s|LB_BOOTAPPEND_LIVE|${LB_BOOTAPPEND_LIVE}|" binary/boot/grub/menu.lst 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 diff --git a/scripts/build/config b/scripts/build/config index 357c3049b..b86d172d6 100755 --- a/scripts/build/config +++ b/scripts/build/config @@ -1282,7 +1282,6 @@ EOF # Creating lb_binary_* configuration mkdir -p config/debian-installer -mkdir -p config/binary_grub mkdir -p config/includes.binary mkdir -p config/includes.binary_debian-installer mkdir -p config/packages.binary |