[Debian-live-changes] r2365 - in dists/trunk/live-helper: docs helpers

[daniel at alioth.debian.org]

Author: daniel
Date: 2007-07-02 13:11:54 +0000 (Mon, 02 Jul 2007)
New Revision: 2365

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


Modified: dists/trunk/live-helper/docs/ChangeLog
===================================================================
--- dists/trunk/live-helper/docs/ChangeLog	2007-07-02 12:46:06 UTC (rev 2364)
+++ dists/trunk/live-helper/docs/ChangeLog	2007-07-02 13:11:54 UTC (rev 2365)
@@ -1,3 +1,9 @@
+2007-07-02  Daniel Baumann  <daniel at debian.org>
+
+	* helpers/lh_binary_grub:
+	  - Also respect splash.xpm and not just splash.xpm.gz as local grub
+	    splash images.
+
 2007-07-01  Daniel Baumann  <daniel at debian.org>
 
 	* helpers/lh_binary_debian-installer:

Modified: dists/trunk/live-helper/helpers/lh_binary_grub
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_grub	2007-07-02 12:46:06 UTC (rev 2364)
+++ dists/trunk/live-helper/helpers/lh_binary_grub	2007-07-02 13:11:54 UTC (rev 2365)
@@ -234,6 +234,9 @@
 if [ -f config/binary_grub/splash.xpm.gz ]
 then
 	LIVE_GRUB_SPLASH="config/binary_grub/splash.xpm.gz"
+elif [ -f config/binary_grub/splash.xpm ]
+then
+	LIVE_GRUB_SPLASH="config/binary_grub/splash.xpm"
 fi
 
 if [ -n "${LIVE_GRUB_SPLASH}" ]
@@ -247,7 +250,8 @@
 		sed -i -e "s/splashimage.*//" binary/boot/grub/menu.lst
 	else
 		# Overwriting splash file
-		cp -f "${LIVE_GRUB_SPLASH}" binary/boot/grub/splash.xpm.gz
+		cp -f "${LIVE_GRUB_SPLASH}" binary/boot/grub
+		sed -i -e "s#splashimage.*#splashimage /boot/grub/`basename ${LIVE_GRUB_SPLASH}`#" binary/boot/grub/menu.lst
 	fi
 fi