[Debian-live-changes] r1694 - dists/trunk/live-helper/helpers

[daniel at alioth.debian.org]

Author: daniel
Date: 2007-05-24 14:38:32 +0000 (Thu, 24 May 2007)
New Revision: 1694

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-05-24 14:31:46 UTC (rev 1693)
+++ dists/trunk/live-helper/helpers/lh_binary_syslinux	2007-05-24 14:38:32 UTC (rev 1694)
@@ -330,11 +330,19 @@
 		;;
 
 	usb-hdd|hdd)
+		# Workaround for syslinux (<< 3.36) which doesn't support dedicated directory
+		if [ "${LIVE_DISTRIBUTION}" = "etch" ] || [ "${LIVE_DISTRIBUTION}" = "lenny" ]
+		then
+			DESTDIR="binary"
+		else
+			DESTDIR="binary/syslinux"
+		fi
+
 		# Copying syslinux
-		mkdir -p binary
-		cp chroot/usr/lib/syslinux/isolinux.bin binary/syslinux.bin
-		cp -r "${LIVE_TEMPLATES}"/syslinux/* binary
-		mv binary/isolinux.cfg binary/syslinux.cfg
+		mkdir -p "${DESTDIR}"
+		cp chroot/usr/lib/syslinux/isolinux.bin "${DESTDIR}"/syslinux.bin
+		cp -r "${LIVE_TEMPLATES}"/syslinux/* "${DESTDIR}"
+		mv binary/isolinux.cfg "${DESTDIR}"/syslinux.cfg
 
 		# Copying splash screen
 		if [ -f config/binary_syslinux/splash.rle ]
@@ -346,23 +354,23 @@
 		then
 			if [ "${LIVE_SYSLINUX_SPLASH}" = "none" ]
 			then
-				rm -f binary/splash.rle
-				sed -e "s/.*splash.*//" binary/syslinux.txt
+				rm -f "${DESTDIR}"/splash.rle
+				sed -e "s/.*splash.*//" "${DESTDIR}"/boot.txt
 			else
-				cp -f "${LIVE_SYSLINUX_SPLASH}" binary/splash.rle
+				cp -f "${LIVE_SYSLINUX_SPLASH}" "${DESTDIR}"/splash.rle
 			fi
 		fi
 
 		# Configure syslinux templates
-		sed -i -e "s#LIVE_LINUX_LIVE#${LINUX}#" -e "s#LIVE_LINUX_INSTALL#${LIVE_LINUX_INSTALL}#" -e "s#LIVE_MEMTEST#${MEMTEST}#" binary/syslinux.cfg
-		sed -i -e "s#LIVE_BOOTAPPEND#${LIVE_BOOTAPPEND}#" binary/syslinux.cfg
-		sed -i -e "s/LIVE_DATE/`date +%Y%m%d`/" binary/f1.txt
-		sed -i -e "s/LIVE_VERSION/${VERSION}/" binary/f10.txt
+		sed -i -e "s#LIVE_LINUX_LIVE#${LINUX}#" -e "s#LIVE_LINUX_INSTALL#${LIVE_LINUX_INSTALL}#" -e "s#LIVE_MEMTEST#${MEMTEST}#" "${DESTDIR}"/syslinux.cfg
+		sed -i -e "s#LIVE_BOOTAPPEND#${LIVE_BOOTAPPEND}#" "${DESTDIR}"/syslinux.cfg
+		sed -i -e "s/LIVE_DATE/`date +%Y%m%d`/" "${DESTDIR}"/f1.txt
+		sed -i -e "s/LIVE_VERSION/${VERSION}/" "${DESTDIR}"/f10.txt
 
 		# Remove unused files
-		rm -f binary/pxelinux.cfg
+		rm -f "${DESTDIR}"/pxelinux.cfg
 
-		# Working arround syslinux 8.3 limitation
+		# Workaround for syslinux (<< 3.36) which doesn't support long file/path names
 		if [ "`echo ${LIVE_LINUX_FLAVOURS} | wc -w`" -gt "1" ]
 		then
 			for FLAVOUR in ${LIVE_LINUX_FLAVOURS}
@@ -371,12 +379,12 @@
 
 				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/syslinux.cfg
+				sed -i -e "s/vmlinuz-.*-${FLAVOUR}/vmlinuz${NUMBER}/g" -e "s/initrd.img-.*-${FLAVOUR}/initrd${NUMBER}.img/g" "${DESTDIR}"/syslinux.cfg
 			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/syslinux.cfg
+			sed -i -e "s/vmlinuz-.*-${LIVE_LINUX_FLAVOURS}/vmlinuz/g" -e "s/initrd.img-.*-${LIVE_LINUX_FLAVOURS}/initrd.img/g" "${DESTDIR}"/syslinux.cfg
 		fi
 		;;
 esac