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

Better do an explicit check for D-I syslinux config version

This commit is contained in:
Frans Pop 2009-05-31 23:53:55 +00:00
parent 617497fff0
commit fc09043feb
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -208,10 +208,17 @@ 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 di_syslinux_ver="$(di_syslinux_version)"
echo "Error: syslinux config version 1.0 is no longer supported" case "$di_syslinux_ver" in
exit 1 2.0)
fi : ;;
1.*)
echo "Error: syslinux config versions before 2.0 are not supported"
exit 1 ;;
*)
echo "Error: unrecognized syslinux config version '$di_syslinux_ver'"
exit 1 ;;
esac
# 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

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

@ -1,7 +1,7 @@
# 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() { di_syslinux_version() {
local version local version
version=$(sed -nr "s/^# D-I config version ([0-9.])/\1/p" \ version=$(sed -nr "s/^# D-I config version ([0-9.])/\1/p" \
boot$N/isolinux/isolinux.cfg) boot$N/isolinux/isolinux.cfg)