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

[daniel at alioth.debian.org]

Author: daniel
Date: 2007-07-02 14:37:49 +0000 (Mon, 02 Jul 2007)
New Revision: 2371

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


Modified: dists/trunk/live-helper/helpers/lh_binary_yaboot
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_yaboot	2007-07-02 14:21:35 UTC (rev 2370)
+++ dists/trunk/live-helper/helpers/lh_binary_yaboot	2007-07-02 14:37:49 UTC (rev 2371)
@@ -71,9 +71,11 @@
 	INITRD="${3}"
 	APPEND="${4}"
 
-	LINUX_LIVE="${LINUX_LIVE}\nimage=/${KERNEL}\n"
+	DIRECTORY="/`basename ${DESTDIR_LIVE}`"
+
+	LINUX_LIVE="${LINUX_LIVE}\nimage=${DIRECTORY}/${KERNEL}\n"
 	LINUX_LIVE="${LINUX_LIVE}\tlabel=${LABEL}\n"
-	LINUX_LIVE="${LINUX_LIVE}\tinitrd=/${INITRD}\n"
+	LINUX_LIVE="${LINUX_LIVE}\tinitrd=${DIRECTORY}/${INITRD}\n"
 	LINUX_LIVE="${LINUX_LIVE}\tappend=LIVE_BOOTAPPEND ${APPEND}\n"
 	LINUX_LIVE="${LINUX_LIVE}\tinitrd-size=10240\n"
 }
@@ -85,9 +87,11 @@
 	INITRD="${3}"
 	APPEND="${4}"
 
-	LINUX_LIVE="${LINUX_LIVE}\nimage=/${KERNEL}\n"
+	DIRECTORY="/`basename ${DESTDIR_LIVE}`"
+
+	LINUX_LIVE="${LINUX_LIVE}\nimage=${DIRECTORY}/${KERNEL}\n"
 	LINUX_LIVE="${LINUX_LIVE}\tlabel=${LABEL}\n"
-	LINUX_LIVE="${LINUX_LIVE}\tinitrd=/${INITRD}\n"
+	LINUX_LIVE="${LINUX_LIVE}\tinitrd=${DIRECTORY}/${INITRD}\n"
 	LINUX_LIVE="${LINUX_LIVE}\tappend=LIVE_BOOTAPPEND ${APPEND} --\n"
 	LINUX_LIVE="${LINUX_LIVE}\tinitrd-size=10240\n"
 }