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

[Daniel Baumann]

Author: daniel
Date: 2007-04-25 19:44:18 +0000 (Wed, 25 Apr 2007)
New Revision: 1176

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


Modified: dists/trunk/live-helper/helpers/lh_binary_grub
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_grub	2007-04-25 19:32:58 UTC (rev 1175)
+++ dists/trunk/live-helper/helpers/lh_binary_grub	2007-04-25 19:44:18 UTC (rev 1176)
@@ -178,14 +178,6 @@
 then
 	MEMTEST="title\t\t${LIVE_MEMTEST}\nkernel\t\t/`basename ${DESTDIR_LIVE}`/memtest"
 	MEMTEST="`echo ${MEMTEST} | sed -e 's#//#/#g'`"
-
-cat >> binary/boot/grub/menu.lst << EOF
-
-title		Other:
-root
-
-LIVE_MEMTEST
-EOF
 fi
 
 # Copying templates
@@ -217,7 +209,7 @@
 		rm -f binary/boot/grub/splash.xpm.gz
 
 		# Removing splash entry
-		sed -e "s/splashimage.*//" binary/boot/grub/menu.lst
+		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
@@ -225,6 +217,14 @@
 fi
 
 # Configure grub templates
+cat >> binary/boot/grub/menu.lst << EOF
+
+title		Other:
+root
+
+LIVE_MEMTEST
+EOF
+
 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
 

Modified: dists/trunk/live-helper/helpers/lh_binary_includes
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_includes	2007-04-25 19:32:58 UTC (rev 1175)
+++ dists/trunk/live-helper/helpers/lh_binary_includes	2007-04-25 19:44:18 UTC (rev 1176)
@@ -111,8 +111,8 @@
 		DEBIAN_TOOLS_TXT="/tools/"
 	fi
 
-	sed -i -e "s/DEBIAN_NAME/${DEBIAN_NAME}/g" -e "s/DEBIAN_DATE/${DEBIAN_DATE}/g" -e "s/DEBIAN_TOOLS/${DEBIAN_TOOLS_HTML}/g" binary/README.html
-	sed -i -e "s/DEBIAN_NAME/${DEBIAN_NAME}/g" -e "s/DEBIAN_DATE/${DEBIAN_DATE}/g" -e "s/DEBIAN_TOOLS/${DEBIAN_TOOLS_TXT}/g" binary/README.txt
+	sed -i -e "s/DEBIAN_NAME/${DEBIAN_NAME}/g" -e "s/DEBIAN_DATE/${DEBIAN_DATE}/g" -e "s#DEBIAN_TOOLS#${DEBIAN_TOOLS_HTML}#g" binary/README.html
+	sed -i -e "s/DEBIAN_NAME/${DEBIAN_NAME}/g" -e "s/DEBIAN_DATE/${DEBIAN_DATE}/g" -e "s#DEBIAN_TOOLS#${DEBIAN_TOOLS_TXT}#g" binary/README.txt
 fi
 
 # Creating stage file