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

[Daniel Baumann]

Author: daniel
Date: 2007-04-11 19:15:18 +0000 (Wed, 11 Apr 2007)
New Revision: 1026

Modified:
   dists/trunk/live-helper/helpers/lh_binary_grub
Log:


Modified: dists/trunk/live-helper/helpers/lh_binary_grub
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_grub	2007-04-11 18:59:21 UTC (rev 1025)
+++ dists/trunk/live-helper/helpers/lh_binary_grub	2007-04-11 19:15:18 UTC (rev 1026)
@@ -203,10 +203,17 @@
 # Copying splash screen
 if [ -n "${LIVE_GRUB_SPLASH}" ]
 then
-	# FIXME
-	cp "${LIVE_GRUB_SPLASH}" binary/boot/grub
+	if [ "${LIVE_GRUB_SPLASH}" = "none" ]
+	then
+		# Removing splash file
+		rm -f binary/boot/grub/splash.xpm.gz
 
-	LIVE_SPLASH="splashimage /boot/grub/`basename ${LIVE_GRUB_SPLASH}`"
+		# Removing splash entry
+		sed -e "s/splashimage.*//" binary/boot/grub/menu.lst
+	else
+		# Overwriting splash file
+		cp -f "${LIVE_GRUB_SPLASH}" binary/boot/grub/splash.xpm.gz
+	fi
 fi
 
 # Configure grub templates
@@ -216,11 +223,10 @@
 title		Other:
 root
 
-
 LIVE_MEMTEST
 EOF
 
-sed -i -e "s#LIVE_SPLASH#${LIVE_SPLASH}#" -e "s#LIVE_KERNEL_LIVE#${LINUX}#" -e "s#LIVE_KERNEL_INSTALL#${LIVE_KERNEL_INSTALL}#" -e "s#LIVE_MEMTEST#${MEMTEST}#" binary/boot/grub/menu.lst
+sed -i -e "s#LIVE_KERNEL_LIVE#${LINUX}#" -e "s#LIVE_KERNEL_INSTALL#${LIVE_KERNEL_INSTALL}#" -e "s#LIVE_MEMTEST#${MEMTEST}#" binary/boot/grub/menu.lst
 sed -i -e "s#LIVE_BOOTAPPEND#${LIVE_BOOTAPPEND}#" binary/boot/grub/menu.lst
 
 if [ -n "${PACKAGES}" ]