manuel
/
live-build
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Daniel Baumann 2012-10-22 20:34:10 +02:00
parent bd5f6bc104
commit 46de5bb96c
3 changed files with 0 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
scripts/build/binary_grub
View File

@ -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

28
scripts/build/binary_grub2
View File

@ -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

1
scripts/build/config
View File

@ -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