Peppermint
/
debian-cd-clone
mirror of https://salsa.debian.org/images-team/debian-cd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

x86: fail build if old syslinux config is detected

This commit is contained in:
Frans Pop 2009-05-31 22:45:12 +00:00
parent ce3806e8af
commit 617497fff0
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tools/boot/squeeze/boot-x86
View File

@ -208,6 +208,11 @@ if [ "$THISTYPE" = "isolinux" ]; then
# Isolinux setup including config and help files comes from d-i. # Isolinux setup including config and help files comes from d-i.
cat cdrom/debian-cd_info.tar.gz | (cd boot$N/isolinux/; tar zx) cat cdrom/debian-cd_info.tar.gz | (cd boot$N/isolinux/; tar zx)
if [ "$(di_config_version)" = "1.0" ]; then
echo "Error: syslinux config version 1.0 is no longer supported"
exit 1
fi
# Not everything in the tarball is isolinux stuff # Not everything in the tarball is isolinux stuff
if [ -e boot$N/isolinux/win32-loader.ini ] ; then if [ -e boot$N/isolinux/win32-loader.ini ] ; then
mv boot$N/isolinux/g2ldr* boot$N/isolinux/setup.exe \ mv boot$N/isolinux/g2ldr* boot$N/isolinux/setup.exe \

9
tools/boot/squeeze/x86-desktop.sh
View File

@ -1,6 +1,15 @@
# Functions to convert isolinux config to allow selection of desktop # Functions to convert isolinux config to allow selection of desktop
# environment for certain images. # environment for certain images.
di_config_version() {
local version
version=$(sed -nr "s/^# D-I config version ([0-9.])/\1/p" \
boot$N/isolinux/isolinux.cfg)
[ -n "Sversion" ] || return 1
echo "$version"
}
# Workaround for #505243 # Workaround for #505243
# Syslinux does not correctly handle a default64 option in combination # Syslinux does not correctly handle a default64 option in combination
# with vesamenu. Instead, add special default label to automatically # with vesamenu. Instead, add special default label to automatically