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

[Daniel Baumann]

Author: daniel
Date: 2007-04-11 19:22:26 +0000 (Wed, 11 Apr 2007)
New Revision: 1027

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-04-11 19:15:18 UTC (rev 1026)
+++ dists/trunk/live-helper/helpers/lh_binary_syslinux	2007-04-11 19:22:26 UTC (rev 1027)
@@ -121,7 +121,7 @@
 # Setting boot parameters
 if [ -n "${LIVE_ENCRYPTION}" ]
 then
-LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} encryption=${LIVE_ENCRYPTION}"
+	LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} encryption=${LIVE_ENCRYPTION}"
 fi
 
 if [ -n "${LIVE_USERNAME}" ]
@@ -193,7 +193,13 @@
 		# Copying splash screen
 		if [ -n "${LIVE_SYSLINUX_SPLASH}" ]
 		then
-			cp "${LIVE_SYSLINUX_SPLASH}" binary/isolinux/splash.rle
+			if [ "${LIVE_SYSLINUX_SPLASH}" = "none" ]
+			then
+				rm -f binary/isolinux/splash.rle
+				sed -e "s/.*splash.*//" binary/isolinux/isolinux.txt
+			else
+				cp -f "${LIVE_SYSLINUX_SPLASH}" binary/isolinux/splash.rle
+			fi
 		fi
 
 		# Configure syslinux templates
@@ -236,7 +242,13 @@
 		# Copying splash screen
 		if [ -n "${LIVE_SYSLINUX_SPLASH}" ]
 		then
-			cp "${LIVE_SYSLINUX_SPLASH}" tftpboot/pxelinux.cfg/splash.rle
+			if [ "${LIVE_SYSLINUX_SPLASH}" = "none" ]
+			then
+				rm -f tftpboot/pxelinux.cfg/splash.rle
+				sed -e "s/.*splash.*//" tftpboot/pxelinux.cfg/isolinux.txt
+			else
+				cp -f "${LIVE_SYSLINUX_SPLASH}" tftpboot/pxelinux.cfg/splash.rle
+			fi
 		fi
 
 		# Configure syslinux templates
@@ -278,7 +290,13 @@
 		# Copying splash screen
 		if [ -n "${LIVE_SYSLINUX_SPLASH}" ]
 		then
-			cp "${LIVE_SYSLINUX_SPLASH}" binary/splash.rle
+			if [ "${LIVE_SYSLINUX_SPLASH}" = "none" ]
+			then
+				rm -f binary/splash.rle
+				sed -e "s/.*splash.*//" binary/syslinux.txt
+			else
+				cp -f "${LIVE_SYSLINUX_SPLASH}" binary/splash.rle
+			fi
 		fi
 
 		# Configure syslinux templates