[Debian-live-changes] r1100 - in dists/trunk/live-helper: doc helpers

[Daniel Baumann]

Author: daniel
Date: 2007-04-19 07:32:05 +0000 (Thu, 19 Apr 2007)
New Revision: 1100

Modified:
   dists/trunk/live-helper/doc/ChangeLog
   dists/trunk/live-helper/helpers/lh_binary_grub
   dists/trunk/live-helper/helpers/lh_binary_syslinux
   dists/trunk/live-helper/helpers/lh_config
Log:


Modified: dists/trunk/live-helper/doc/ChangeLog
===================================================================
--- dists/trunk/live-helper/doc/ChangeLog	2007-04-18 21:19:58 UTC (rev 1099)
+++ dists/trunk/live-helper/doc/ChangeLog	2007-04-19 07:32:05 UTC (rev 1100)
@@ -1,3 +1,8 @@
+2007-04-19  Daniel Baumann  <daniel at debian.org>
+
+	* helpers/lh_binary_grub, lh_binary_syslinux:
+	  - Added check for splash in config directory.
+
 2007-04-18  Daniel Baumann  <daniel at debian.org>
 
 	* debian/cron.daily, default:

Modified: dists/trunk/live-helper/helpers/lh_binary_grub
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_grub	2007-04-18 21:19:58 UTC (rev 1099)
+++ dists/trunk/live-helper/helpers/lh_binary_grub	2007-04-19 07:32:05 UTC (rev 1100)
@@ -185,6 +185,11 @@
 esac
 
 # Copying splash screen
+if [ -f config/binary_grub/splash.xpm.gz ]
+then
+	LIVE_GRUB_SPLASH="config/binary_grub/splash.xpm.gz"
+fi
+
 if [ -n "${LIVE_GRUB_SPLASH}" ]
 then
 	if [ "${LIVE_GRUB_SPLASH}" = "none" ]

Modified: dists/trunk/live-helper/helpers/lh_binary_syslinux
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_syslinux	2007-04-18 21:19:58 UTC (rev 1099)
+++ dists/trunk/live-helper/helpers/lh_binary_syslinux	2007-04-19 07:32:05 UTC (rev 1100)
@@ -204,6 +204,11 @@
 		cp -r "${LIVE_TEMPLATES}"/syslinux/* binary/isolinux
 
 		# Copying splash screen
+		if [ -f config/binary_syslinux/splash.rle ]
+		then
+			LIVE_SYSLINUX_SPLASH="config/binary_syslinux/splash.rle"
+		fi
+
 		if [ -n "${LIVE_SYSLINUX_SPLASH}" ]
 		then
 			if [ "${LIVE_SYSLINUX_SPLASH}" = "none" ]
@@ -253,6 +258,11 @@
 		sed -i -e 's#splash.rle#pxelinux.cfg/splash.rle#' tftpboot/pxelinux.cfg/isolinux.txt
 
 		# Copying splash screen
+		if [ -f config/binary_syslinux/splash.rle ]
+		then
+			LIVE_SYSLINUX_SPLASH="config/binary_syslinux/splash.rle"
+		fi
+
 		if [ -n "${LIVE_SYSLINUX_SPLASH}" ]
 		then
 			if [ "${LIVE_SYSLINUX_SPLASH}" = "none" ]
@@ -301,6 +311,11 @@
 		sed -i -e "s/isolinux.txt/syslinux.txt/" binary/syslinux.cfg
 
 		# Copying splash screen
+		if [ -f config/binary_syslinux/splash.rle ]
+		then
+			LIVE_SYSLINUX_SPLASH="config/binary_syslinux/splash.rle"
+		fi
+
 		if [ -n "${LIVE_SYSLINUX_SPLASH}" ]
 		then
 			if [ "${LIVE_SYSLINUX_SPLASH}" = "none" ]

Modified: dists/trunk/live-helper/helpers/lh_config
===================================================================
--- dists/trunk/live-helper/helpers/lh_config	2007-04-18 21:19:58 UTC (rev 1099)
+++ dists/trunk/live-helper/helpers/lh_config	2007-04-19 07:32:05 UTC (rev 1100)
@@ -327,4 +327,6 @@
 EOF
 
 # Creating lh_binary_* directories
+mkdir -p "${LIVE_ROOT}"/config/binary_grub
 mkdir -p "${LIVE_ROOT}"/config/binary_localincludes
+mkdir -p "${LIVE_ROOT}"/config/binary_syslinux