all the pxelinux configs should use relative paths from
the tftp root. This patch fixes the location of the
config files to match the entries in the default config.
One could instead change the paths in the default config
file, but I think it is cleaner to only store the
base configurations in the pxelinux.cfg directory.
-Jesse
Index: helpers/lh_binary_syslinux
===================================================================
--- helpers/lh_binary_syslinux (revision 2655)
+++ helpers/lh_binary_syslinux (working copy)
@@ -433,34 +433,34 @@
esac
mkdir -p tftpboot/pxelinux.cfg
- cp -r "${TEMPLATES}"/* tftpboot/pxelinux.cfg
+ cp -r "${TEMPLATES}"/* tftpboot/
- for FILE in tftpboot/pxelinux.cfg/*.live
+ for FILE in tftpboot/*.live
do
mv ${FILE} `dirname ${FILE}`/`basename ${FILE} .live`
done
if [ "${LIVE_DEBIAN_INSTALLER}" != "disabled" ]
then
- for FILE in tftpboot/pxelinux.cfg/*.install
+ for FILE in tftpboot/*.install
do
mv ${FILE} `dirname ${FILE}`/`basename ${FILE} .install`
done
if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
then
- for FILE in tftpboot/pxelinux.cfg/*.install.g-i
+ for FILE in tftpboot/*.install.g-i
do
mv ${FILE} `dirname ${FILE}`/`basename ${FILE} .install.g-i`
done
else
- rm -f tftpboot/pxelinux.cfg/*.install.g-i
+ rm -f tftpboot/*.install.g-i
fi
else
- rm -f tftpboot/pxelinux.cfg/*.install*
+ rm -f tftpboot/*.install*
fi
- mv tftpboot/pxelinux.cfg/syslinux.cfg tftpboot/pxelinux.cfg/default
+ mv tftpboot/syslinux.cfg tftpboot/pxelinux.cfg/default
# Copying local configuration file
if [ -f config/binary_syslinux/syslinux.cfg ]
@@ -480,19 +480,19 @@
then
if [ "${LIVE_SYSLINUX_SPLASH}" = "none" ]
then
- rm -f tftpboot/pxelinux.cfg/splash.rle
- sed -e "s/.*splash.*//" tftpboot/pxelinux.cfg/boot.txt
+ rm -f tftpboot/splash.rle
+ sed -e "s/.*splash.*//" tftpboot/boot.txt
else
- cp -f "${LIVE_SYSLINUX_SPLASH}" tftpboot/pxelinux.cfg/splash.rle
+ cp -f "${LIVE_SYSLINUX_SPLASH}" tftpboot/splash.rle
fi
fi
# Configure syslinux templates
sed -i -e "[EMAIL PROTECTED]@${LINUX_LIVE}@" -e "[EMAIL PROTECTED]@${LINUX_INSTALL}@" -e "[EMAIL PROTECTED]@${MEMTEST}@" tftpboot/pxelinux.cfg/default
sed -i -e "s#LIVE_BOOTAPPEND#${LIVE_BOOTAPPEND}#" -e "s/LIVE_NET_SERVER/${LIVE_NET_SERVER}/" -e "s#LIVE_NET_PATH#${LIVE_NET_PATH}#" tftpboot/pxelinux.cfg/default
- sed -i -e "s/LIVE_DISTRIBUTION/${LIVE_DISTRIBUTION}/" -e "s/LIVE_DATE/`date +%Y%m%d`/" -e "s/LIVE_MEDIA/netboot/" tftpboot/pxelinux.cfg/f1.txt
- sed -i -e "s/LIVE_MEDIA/netboot/" tftpboot/pxelinux.cfg/f3.txt
- sed -i -e "s/LIVE_VERSION/${VERSION}/" tftpboot/pxelinux.cfg/f10.txt
+ sed -i -e "s/LIVE_DISTRIBUTION/${LIVE_DISTRIBUTION}/" -e "s/LIVE_DATE/`date +%Y%m%d`/" -e "s/LIVE_MEDIA/netboot/" tftpboot/f1.txt
+ sed -i -e "s/LIVE_MEDIA/netboot/" tftpboot/f3.txt
+ sed -i -e "s/LIVE_VERSION/${VERSION}/" tftpboot/f10.txt
# Working arround syslinux 8.3 limitation
if [ "`echo ${LIVE_LINUX_FLAVOURS} | wc -w`" -eq "1" ]
_______________________________________________
debian-live-devel mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/debian-live-devel
