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

[daniel at alioth.debian.org]

Author: daniel
Date: 2007-07-02 14:21:35 +0000 (Mon, 02 Jul 2007)
New Revision: 2370

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:08:47 UTC (rev 2369)
+++ dists/trunk/live-helper/helpers/lh_binary_yaboot	2007-07-02 14:21:35 UTC (rev 2370)
@@ -71,9 +71,9 @@
 	INITRD="${3}"
 	APPEND="${4}"
 
-	LINUX_LIVE="${LINUX_LIVE}\nimage=${KERNEL}\n"
+	LINUX_LIVE="${LINUX_LIVE}\nimage=/${KERNEL}\n"
 	LINUX_LIVE="${LINUX_LIVE}\tlabel=${LABEL}\n"
-	LINUX_LIVE="${LINUX_LIVE}\tinitrd=${INITRD}\n"
+	LINUX_LIVE="${LINUX_LIVE}\tinitrd=/${INITRD}\n"
 	LINUX_LIVE="${LINUX_LIVE}\tappend=LIVE_BOOTAPPEND ${APPEND}\n"
 	LINUX_LIVE="${LINUX_LIVE}\tinitrd-size=10240\n"
 }
@@ -85,9 +85,9 @@
 	INITRD="${3}"
 	APPEND="${4}"
 
-	LINUX_LIVE="${LINUX_LIVE}\nimage=${KERNEL}\n"
+	LINUX_LIVE="${LINUX_LIVE}\nimage=/${KERNEL}\n"
 	LINUX_LIVE="${LINUX_LIVE}\tlabel=${LABEL}\n"
-	LINUX_LIVE="${LINUX_LIVE}\tinitrd=${INITRD}\n"
+	LINUX_LIVE="${LINUX_LIVE}\tinitrd=/${INITRD}\n"
 	LINUX_LIVE="${LINUX_LIVE}\tappend=LIVE_BOOTAPPEND ${APPEND} --\n"
 	LINUX_LIVE="${LINUX_LIVE}\tinitrd-size=10240\n"
 }
@@ -188,7 +188,7 @@
 LIVE_BOOTAPPEND="`echo ${LIVE_BOOTAPPEND} | sed -e 's/  //'`"
 
 # Parameters are listed at: linux/Documentation/kernel-parameters.txt
-FAILSAFE="noapic noapm nodma nomce nolapic nosmp vga=normal" # FIXME
+FAILSAFE="noapic noapm nodma nomce nolapic nosmp vga=ofonly"
 
 # Assembling kernel configuration