From: Andres Salomon <dilinger@debian.org>
Date: Wed, 20 Aug 2008 16:21:48 +0000 (-0400)
Subject: fix up olpc.fth creation for ext3 images; use disk: rather than nand:
X-Git-Tag: v0.1~3
X-Git-Url: https://spindle.queued.net/cgi-bin/gitweb.cgi?p=xodist;a=commitdiff_plain;h=650570308db4de6878e8d6d1a2df3de6a6f1051a

fix up olpc.fth creation for ext3 images; use disk: rather than nand:
Signed-off-by: Andres Salomon <dilinger@debian.org>
---

diff --git a/functions.sh b/functions.sh
index 705c4c9..5a45aa0 100644
--- a/functions.sh
+++ b/functions.sh
@@ -61,9 +61,11 @@ create_ofwboot()
 	if [ "${fstype}" = "jffs2" ]; then
 		r=mtd0
 		rfs="rootfstype=jffs2"
+		dev=nand
 	else
 		r=/dev/sda1
 		rfs=""
+		dev=disk
 	fi
 
 	cat >${mntpt}/boot/olpc.fth<<EOF
@@ -72,10 +74,10 @@ create_ofwboot()
 " ro root=${r} ${rfs} fbcon=font:SUN12x22" to boot-file
 game-key-mask h# 80 and if
 	\\ boot from backup kernel
-	" nand:\\vmlinuz.old" to boot-device
+	" ${dev}:\\vmlinuz.old" to boot-device
 else
 	\\ boot from regular kernel
-	" nand:\\vmlinuz" to boot-device
+	" ${dev}:\\vmlinuz" to boot-device
 then
 boot
 EOF