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

[Daniel Baumann]

Author: daniel
Date: 2007-04-01 19:11:43 +0000 (Sun, 01 Apr 2007)
New Revision: 912

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-01 19:07:33 UTC (rev 911)
+++ dists/trunk/live-helper/helpers/lh_binary_grub	2007-04-01 19:11:43 UTC (rev 912)
@@ -71,7 +71,7 @@
 	# Setting destination directory
 	case "${LIVE_BINARY_IMAGE}" in
 		iso)
-			DESTDIR="binary/live"
+			DESTDIR="binary/boot/grub"
 			;;
 
 		net)
@@ -83,16 +83,6 @@
 			;;
 	esac
 
-	# Temporary check for broken grub
-	if [ "${LIVE_BINARY_IMAGE}" = "iso" ]
-	then
-		case "${LIVE_ARCHITECTURE}" in
-			i386)
-				DESTDIR="${DESTDIR}.386"
-				;;
-		esac
-	fi
-
 	# Creating directory
 	if [ ! -d "${DESTDIR}" ]
 	then
@@ -167,19 +157,19 @@
 	case "${LIVE_BINARY_IMAGE}" in
 		iso)
 			# Copying grub
-			mkdir -p binary/grub
-			cp chroot/usr/lib/grub/i386-pc/stage2_eltorito binary/grub
-			cp -r "${LIVE_TEMPLATES}"/grub/* binary/grub
+			mkdir -p "${DESTDIR}"
+			cp chroot/usr/lib/grub/i386-pc/stage2_eltorito "${DESTDIR}"
+			cp -r "${LIVE_TEMPLATES}"/grub/* "${DESTDIR}"
 
 			# Copying splash screen
 			if [ -n "${LIVE_GRUB_SPLASH}" ]
 			then
-				cp "${LIVE_GRUB_SPLASH}" binary/grub
+				cp "${LIVE_GRUB_SPLASH}" "${DESTDIR}"
 			fi
 
 			# Configure grub templates
-			sed -i -e "s#LIVE_KERNEL#${LINUX}#" -e "s#LIVE_MEMTEST#${MEMTEST}#" binary/grub/menu.lst
-			sed -i -e "s#LIVE_BOOTAPPEND#${LIVE_BOOTAPPEND}#" binary/grub/menu.lst
+			sed -i -e "s#LIVE_KERNEL#${LINUX}#" -e "s#LIVE_MEMTEST#${MEMTEST}#" "${DESTDIR}"/menu.lst
+			sed -i -e "s#LIVE_BOOTAPPEND#${LIVE_BOOTAPPEND}#" "${DESTDIR}"/menu.lst
 
 			# Working arround grub 8.3 limitation
 			if [ "`echo ${LIVE_KERNEL_FLAVOUR} | wc -w`" -gt "1" ]
@@ -190,12 +180,12 @@
 
 					mv "${DESTDIR}"/vmlinuz-*-${FLAVOUR} "${DESTDIR}"/vmlinuz${NUMBER}
 					mv "${DESTDIR}"/initrd.img-*-${FLAVOUR} "${DESTDIR}"/initrd${NUMBER}.img
-					sed -i -e "s/linux.*-${FLAVOUR}/linux${NUMBER}/g" -e "s/vmlinuz-.*-${FLAVOUR}/vmlinuz${NUMBER}/g" -e "s/initrd.img-.*-${FLAVOUR}/initrd${NUMBER}.img/g" binary/grub/menu.lst
+					sed -i -e "s/linux.*-${FLAVOUR}/linux${NUMBER}/g" -e "s/vmlinuz-.*-${FLAVOUR}/vmlinuz${NUMBER}/g" -e "s/initrd.img-.*-${FLAVOUR}/initrd${NUMBER}.img/g" "${DESTDIR}"/menu.lst
 				done
 			else
 				mv "${DESTDIR}"/vmlinuz-*-${LIVE_KERNEL_FLAVOUR} "${DESTDIR}"/vmlinuz
 				mv "${DESTDIR}"/initrd.img-*-${LIVE_KERNEL_FLAVOUR} "${DESTDIR}"/initrd.img
-				sed -i -e "s/linux.*-${LIVE_KERNEL_FLAVOUR}/linux/g" -e "s/vmlinuz-.*-${LIVE_KERNEL_FLAVOUR}/vmlinuz/g" -e "s/initrd.img-.*-${LIVE_KERNEL_FLAVOUR}/initrd.img/g" binary/grub/menu.lst
+				sed -i -e "s/linux.*-${LIVE_KERNEL_FLAVOUR}/linux/g" -e "s/vmlinuz-.*-${LIVE_KERNEL_FLAVOUR}/vmlinuz/g" -e "s/initrd.img-.*-${LIVE_KERNEL_FLAVOUR}/initrd.img/g" "${DESTDIR}"/menu.lst
 			fi
 			;;
 	esac