[Debian-live-changes] r2437 - in dists/trunk/live-helper: helpers templates/syslinux

[daniel at alioth.debian.org]

Author: daniel
Date: 2007-07-09 11:06:03 +0000 (Mon, 09 Jul 2007)
New Revision: 2437

Added:
   dists/trunk/live-helper/templates/syslinux/syslinux.cfg
Removed:
   dists/trunk/live-helper/templates/syslinux/isolinux.cfg
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-09 10:17:23 UTC (rev 2436)
+++ dists/trunk/live-helper/helpers/lh_binary_syslinux	2007-07-09 11:06:03 UTC (rev 2437)
@@ -298,6 +298,8 @@
 		mkdir -p binary/isolinux
 		cp chroot/usr/lib/syslinux/isolinux.bin binary/isolinux
 		cp -r "${LIVE_TEMPLATES}"/syslinux/* binary/isolinux
+		mv "${DESTDIR}"/syslinux.cfg "${DESTDIR}"/isolinux.cfg
+		rm -f "${DESTDIR}"/pxelinux.cfg
 
 		# Copying splash screen
 		if [ -f config/binary_syslinux/splash.rle ]
@@ -322,9 +324,6 @@
 		sed -i -e "s/LIVE_DATE/`date +%Y%m%d`/" binary/isolinux/f1.txt
 		sed -i -e "s/LIVE_VERSION/${VERSION}/" binary/isolinux/f10.txt
 
-		# Remove unused files
-		rm -f binary/isolinux/pxelinux.cfg
-
 		# Working arround syslinux 8.3 limitation
 		if [ "`echo ${LIVE_LINUX_FLAVOURS} | wc -w`" -gt "1" ]
 		then
@@ -353,11 +352,11 @@
 	net)
 		# Copying syslinux
 		cp chroot/usr/lib/syslinux/pxelinux.0 tftpboot
-
-		# Install syslinux templates
 		mkdir -p tftpboot/pxelinux.cfg
 		cp -r "${LIVE_TEMPLATES}"/syslinux/* tftpboot/pxelinux.cfg
 		mv tftpboot/pxelinux.cfg/pxelinux.cfg tftpboot/pxelinux.cfg/default
+		rm -f tftpboot/pxelinux.cfg/syslinux.cfg
+
 		sed -i -e 's#splash.rle#pxelinux.cfg/splash.rle#' tftpboot/pxelinux.cfg/boot.txt
 
 		# Copying splash screen
@@ -383,9 +382,6 @@
 		sed -i -e "s/LIVE_DATE/`date +%Y%m%d`/" tftpboot/pxelinux.cfg/f1.txt
 		sed -i -e "s/LIVE_VERSION/${VERSION}/" tftpboot/pxelinux.cfg/f10.txt
 
-		# Remove unused files
-		rm -f tftpboot/pxelinux.cfg/isolinux.cfg
-
 		# Working arround syslinux 8.3 limitation
 		if [ "`echo ${LIVE_LINUX_FLAVOURS} | wc -w`" -gt "1" ]
 		then
@@ -397,16 +393,16 @@
 
 				mv "${DESTDIR_LIVE}"/vmlinuz-*-${FLAVOUR} "${DESTDIR_LIVE}"/vmlinuz${NUMBER}
 				mv "${DESTDIR_LIVE}"/initrd.img-*-${FLAVOUR} "${DESTDIR_LIVE}"/initrd${NUMBER}.img
-				sed -i -e "s/vmlinuz-.*-${FLAVOUR}$/vmlinuz${NUMBER}/g" -e "s/initrd.img-.*-${FLAVOUR} /initrd${NUMBER}.img /g" binary/isolinux/isolinux.cfg
+				sed -i -e "s/vmlinuz-.*-${FLAVOUR}$/vmlinuz${NUMBER}/g" -e "s/initrd.img-.*-${FLAVOUR} /initrd${NUMBER}.img /g" tftpboot/pxelinux.cfg/default
 			done
 		else
 			mv "${DESTDIR_LIVE}"/vmlinuz-*-${LIVE_LINUX_FLAVOURS} "${DESTDIR_LIVE}"/vmlinuz
 			mv "${DESTDIR_LIVE}"/initrd.img-*-${LIVE_LINUX_FLAVOURS} "${DESTDIR_LIVE}"/initrd.img
-			sed -i -e "s/vmlinuz-.*-${LIVE_LINUX_FLAVOURS}/vmlinuz/g" -e "s/initrd.img-.*-${LIVE_LINUX_FLAVOURS}/initrd.img/g" binary/isolinux/isolinux.cfg
+			sed -i -e "s/vmlinuz-.*-${LIVE_LINUX_FLAVOURS}/vmlinuz/g" -e "s/initrd.img-.*-${LIVE_LINUX_FLAVOURS}/initrd.img/g" tftpboot/pxelinux.cfg/default
 		fi
 
 		# Remove whitespaces
-		sed -i -e 's/\ $//g' binary/isolinux/isolinux.cfg
+		sed -i -e 's/\ $//g' tftpboot/pxelinux.cfg/default
 		;;
 
 	tar|usb-hdd)
@@ -422,7 +418,6 @@
 		mkdir -p "${DESTDIR}"
 		cp chroot/usr/lib/syslinux/isolinux.bin "${DESTDIR}"/syslinux.bin
 		cp -r "${LIVE_TEMPLATES}"/syslinux/* "${DESTDIR}"
-		mv "${DESTDIR}"/isolinux.cfg "${DESTDIR}"/syslinux.cfg
 
 		# Copying splash screen
 		if [ -f config/binary_syslinux/splash.rle ]

Deleted: dists/trunk/live-helper/templates/syslinux/isolinux.cfg
===================================================================
--- dists/trunk/live-helper/templates/syslinux/isolinux.cfg	2007-07-09 10:17:23 UTC (rev 2436)
+++ dists/trunk/live-helper/templates/syslinux/isolinux.cfg	2007-07-09 11:06:03 UTC (rev 2437)
@@ -1,36 +0,0 @@
-
-DISPLAY boot.txt
-
-F1 f1.txt
-F2 f2.txt
-F3 f3.txt
-F4 f4.txt
-F5 f5.txt
-F6 f6.txt
-F7 f7.txt
-F8 f8.txt
-F9 f9.txt
-F0 f10.txt
-
-DEFAULT live
-
-LINUX_LIVE
-
-LINUX_INSTALL
-
-MEMTEST
-
-#LABEL floppy
-#	localboot 0x00
-
-#LABEL disk1
-#	localboot 0x80
-
-#LABEL disk2
-#	localboot 0x81
-
-#LABEL nextboot
-#	localboot -1
-
-PROMPT 1
-TIMEOUT 0

Copied: dists/trunk/live-helper/templates/syslinux/syslinux.cfg (from rev 2436, dists/trunk/live-helper/templates/syslinux/isolinux.cfg)
===================================================================
--- dists/trunk/live-helper/templates/syslinux/syslinux.cfg	                        (rev 0)
+++ dists/trunk/live-helper/templates/syslinux/syslinux.cfg	2007-07-09 11:06:03 UTC (rev 2437)
@@ -0,0 +1,36 @@
+
+DISPLAY boot.txt
+
+F1 f1.txt
+F2 f2.txt
+F3 f3.txt
+F4 f4.txt
+F5 f5.txt
+F6 f6.txt
+F7 f7.txt
+F8 f8.txt
+F9 f9.txt
+F0 f10.txt
+
+DEFAULT live
+
+LINUX_LIVE
+
+LINUX_INSTALL
+
+MEMTEST
+
+#LABEL floppy
+#	localboot 0x00
+
+#LABEL disk1
+#	localboot 0x80
+
+#LABEL disk2
+#	localboot 0x81
+
+#LABEL nextboot
+#	localboot -1
+
+PROMPT 1
+TIMEOUT 0