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

[lamby-guest at alioth.debian.org]

Author: lamby-guest
Date: 2007-06-22 19:58:33 +0000 (Fri, 22 Jun 2007)
New Revision: 2234

Modified:
   dists/trunk/live-helper/helpers/lh_binary_syslinux
Log:
Fixes problem where generating commented lines in isolinux.cfg were breaking build.


Modified: dists/trunk/live-helper/helpers/lh_binary_syslinux
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_syslinux	2007-06-22 18:45:56 UTC (rev 2233)
+++ dists/trunk/live-helper/helpers/lh_binary_syslinux	2007-06-22 19:58:33 UTC (rev 2234)
@@ -331,7 +331,7 @@
 		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/isolinux/isolinux.cfg
+		sed -i -e "s at LIVE_LINUX_LIVE@${LINUX}@" -e "s at LIVE_LINUX_INSTALL@${LIVE_LINUX_INSTALL}@" -e "s at LIVE_MEMTEST@${MEMTEST}@" binary/isolinux/isolinux.cfg
 		sed -i -e "s#LIVE_BOOTAPPEND#${LIVE_BOOTAPPEND}#" binary/isolinux/isolinux.cfg
 		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
@@ -385,7 +385,7 @@
 		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}#" tftpboot/pxelinux.cfg/default
+		sed -i -e "s at LIVE_LINUX_LIVE@${LINUX}@" -e "s at LIVE_LINUX_INSTALL@${LIVE_LINUX_INSTALL}@" -e "s at LIVE_MEMTEST@${MEMTEST}@" tftpboot/pxelinux.cfg/default
 		sed -i -e "s/LIVE_NET_SERVER/${LIVE_NET_SERVER}/" -e "s#LIVE_NET_PATH#${LIVE_NET_PATH}#" -e "s#LIVE_BOOTAPPEND#${LIVE_BOOTAPPEND}#" tftpboot/pxelinux.cfg/default
 		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
@@ -444,7 +444,7 @@
 		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}#" "${DESTDIR}"/syslinux.cfg
+		sed -i -e "s at LIVE_LINUX_LIVE@${LINUX}@" -e "s at LIVE_LINUX_INSTALL@${LIVE_LINUX_INSTALL}@" -e "s at 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