r2657 - dists/trunk/live-helper/helpers

[daniel at alioth.debian.org]

Author: daniel
Date: 2007-07-31 19:30:33 +0000 (Tue, 31 Jul 2007)
New Revision: 2657

Modified:
   dists/trunk/live-helper/helpers/lh_binary_syslinux
Log:


Modified: dists/trunk/live-helper/helpers/lh_binary_syslinux
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_syslinux	2007-07-31 19:23:36 UTC (rev 2656)
+++ dists/trunk/live-helper/helpers/lh_binary_syslinux	2007-07-31 19:30:33 UTC (rev 2657)
@@ -433,34 +433,34 @@
 		esac
 
 		mkdir -p tftpboot/pxelinux.cfg
-		cp -r "${TEMPLATES}"/* tftpboot/
+		cp -r "${TEMPLATES}"/* tftpboot/pxelinux.cfg
 
-		for FILE in tftpboot/*.live
+		for FILE in tftpboot/pxelinux.cfg/*.live
 		do
 			mv ${FILE} `dirname ${FILE}`/`basename ${FILE} .live`
 		done
 
 		if [ "${LIVE_DEBIAN_INSTALLER}" != "disabled" ]
 		then
-			for FILE in tftpboot/*.install
+			for FILE in tftpboot/pxelinux.cfg/*.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/*.install.g-i
+				for FILE in tftpboot/pxelinux.cfg/*.install.g-i
 				do
 					mv ${FILE} `dirname ${FILE}`/`basename ${FILE} .install.g-i`
 				done
 			else
-				rm -f tftpboot/*.install.g-i
+				rm -f tftpboot/pxelinux.cfg/*.install.g-i
 			fi
 		else
-			rm -f tftpboot/*.install*
+			rm -f tftpboot/pxelinux.cfg/*.install*
 		fi
 
-		mv tftpboot/syslinux.cfg tftpboot/pxelinux.cfg/default
+		mv tftpboot/pxelinux.cfg/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/splash.rle
-				sed -e "s/.*splash.*//" tftpboot/boot.txt
+				rm -f tftpboot/pxelinux.cfg/splash.rle
+				sed -e "s/.*splash.*//" tftpboot/pxelinux.cfg/boot.txt
 			else
-				cp -f "${LIVE_SYSLINUX_SPLASH}" tftpboot/splash.rle
+				cp -f "${LIVE_SYSLINUX_SPLASH}" tftpboot/pxelinux.cfg/splash.rle
 			fi
 		fi
 
 		# Configure syslinux templates
 		sed -i -e "s at LINUX_LIVE@${LINUX_LIVE}@" -e "s at LINUX_INSTALL@${LINUX_INSTALL}@" -e "s at MEMTEST@${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/f1.txt
-		sed -i -e "s/LIVE_MEDIA/netboot/" tftpboot/f3.txt
-		sed -i -e "s/LIVE_VERSION/${VERSION}/" tftpboot/f10.txt
+		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
 
 		# Working arround syslinux 8.3 limitation
 		if [ "`echo ${LIVE_LINUX_FLAVOURS} | wc -w`" -eq "1" ]