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

[Daniel Baumann]

Author: daniel
Date: 2007-04-24 09:56:44 +0000 (Tue, 24 Apr 2007)
New Revision: 1155

Added:
   dists/trunk/live-helper/templates/syslinux/boot.txt
Removed:
   dists/trunk/live-helper/templates/syslinux/isolinux.txt
Modified:
   dists/trunk/live-helper/debian/changelog
   dists/trunk/live-helper/helpers/lh_binary_syslinux
Log:


Modified: dists/trunk/live-helper/debian/changelog
===================================================================
--- dists/trunk/live-helper/debian/changelog	2007-04-24 08:00:46 UTC (rev 1154)
+++ dists/trunk/live-helper/debian/changelog	2007-04-24 09:56:44 UTC (rev 1155)
@@ -1,6 +1,7 @@
 live-helper (1.0~a8-1) UNRELEASED; urgency=medium
 
-  * New upstream release
+  * New upstream release:
+    - updated syslinux templates (Closes: #399658).
 
  -- Daniel Baumann <daniel at debian.org>  Mon, 30 Apr 2007 00:00:00 +0200
 

Modified: dists/trunk/live-helper/helpers/lh_binary_syslinux
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_syslinux	2007-04-24 08:00:46 UTC (rev 1154)
+++ dists/trunk/live-helper/helpers/lh_binary_syslinux	2007-04-24 09:56:44 UTC (rev 1155)
@@ -202,7 +202,7 @@
 			if [ "${LIVE_SYSLINUX_SPLASH}" = "none" ]
 			then
 				rm -f binary/isolinux/splash.rle
-				sed -e "s/.*splash.*//" binary/isolinux/isolinux.txt
+				sed -e "s/.*splash.*//" binary/isolinux/boot.txt
 			else
 				cp -f "${LIVE_SYSLINUX_SPLASH}" binary/isolinux/splash.rle
 			fi
@@ -243,7 +243,7 @@
 		mkdir -p tftpboot/pxelinux.cfg
 		cp -r "${LIVE_TEMPLATES}"/syslinux/* tftpboot/pxelinux.cfg
 		mv tftpboot/pxelinux.cfg/pxelinux.cfg tftpboot/pxelinux.cfg/default
-		sed -i -e 's#splash.rle#pxelinux.cfg/splash.rle#' tftpboot/pxelinux.cfg/isolinux.txt
+		sed -i -e 's#splash.rle#pxelinux.cfg/splash.rle#' tftpboot/pxelinux.cfg/boot.txt
 
 		# Copying splash screen
 		if [ -f config/binary_syslinux/splash.rle ]
@@ -256,7 +256,7 @@
 			if [ "${LIVE_SYSLINUX_SPLASH}" = "none" ]
 			then
 				rm -f tftpboot/pxelinux.cfg/splash.rle
-				sed -e "s/.*splash.*//" tftpboot/pxelinux.cfg/isolinux.txt
+				sed -e "s/.*splash.*//" tftpboot/pxelinux.cfg/boot.txt
 			else
 				cp -f "${LIVE_SYSLINUX_SPLASH}" tftpboot/pxelinux.cfg/splash.rle
 			fi
@@ -295,8 +295,6 @@
 		cp chroot/usr/lib/syslinux/isolinux.bin binary/syslinux.bin
 		cp -r "${LIVE_TEMPLATES}"/syslinux/* binary
 		mv binary/isolinux.cfg binary/syslinux.cfg
-		mv binary/isolinux.txt binary/syslinux.txt
-		sed -i -e "s/isolinux.txt/syslinux.txt/" binary/syslinux.cfg
 
 		# Copying splash screen
 		if [ -f config/binary_syslinux/splash.rle ]

Added: dists/trunk/live-helper/templates/syslinux/boot.txt
===================================================================
--- dists/trunk/live-helper/templates/syslinux/boot.txt	2007-04-24 08:00:46 UTC (rev 1154)
+++ dists/trunk/live-helper/templates/syslinux/boot.txt	2007-04-24 09:56:44 UTC (rev 1155)
@@ -0,0 +1,3 @@
+splash.rle
+
+Press F1control and F then 1 for help, or ENTER to 
\ No newline at end of file

Deleted: dists/trunk/live-helper/templates/syslinux/isolinux.txt
===================================================================
--- dists/trunk/live-helper/templates/syslinux/isolinux.txt	2007-04-24 08:00:46 UTC (rev 1154)
+++ dists/trunk/live-helper/templates/syslinux/isolinux.txt	2007-04-24 09:56:44 UTC (rev 1155)
@@ -1,3 +0,0 @@
-splash.rle
-
-Press F1control and F then 1 for help, or ENTER to 
\ No newline at end of file