X-Git-Url: https://spindle.queued.net/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=functions.sh;h=ab7dbe58bfd5005234f41c7a7314d034e1a90250;hb=60f69f877850cb64fd3cafd349bdb7b51c06462a;hp=bc78bfbbd941089a855ed841511b7f5bd9cede65;hpb=a57f3edd1fd261978e7d62b84f73a8177fbeabd6;p=xodist

diff --git a/functions.sh b/functions.sh
index bc78bfb..ab7dbe5 100644
--- a/functions.sh
+++ b/functions.sh
@@ -36,13 +36,17 @@ create_fstab()
 	fstype="$2"
 
 	if [ "${fstype}" = "jffs2" ]; then
-		r=mtd0
+		r=mtd:root
 	else
-		r="LABEL=OLPCRoot"
+		r="LABEL=${IMG_LABEL}"
 	fi
 
-	cat >${mntpt}/etc/fstab<<EOF
-${r} / ${fstype} defaults,noatime 1 1
+	echo "${r} / ${fstype} defaults,noatime 1 1" >${mntpt}/etc/fstab
+	if [ "${fstype}" = "jffs2" ]; then
+		echo "mtd:boot /boot jffs2 defaults,noatime 1 1" >>${mntpt}/etc/fstab
+	fi
+
+	cat >>${mntpt}/etc/fstab<<EOF
 devpts /dev/pts devpts gid=5,mode=620 0 0
 tmpfs /dev/shm tmpfs defaults,size=15% 0 0
 proc /proc proc defaults 0 0
@@ -60,27 +64,36 @@ create_ofwboot()
 	fstype="$2"
 
 	if [ "${fstype}" = "jffs2" ]; then
-		r=mtd0
+		r="mtd:root"
 		rfs="rootfstype=jffs2"
-		dev=nand
 	else
-		r=/dev/sda1
+		r="LABEL=${IMG_LABEL}"
 		rfs=""
-		dev=disk
 	fi
 
 	cat >${mntpt}/boot/olpc.fth<<EOF
 \\ OLPC boot script
 
+\\ fetch the /chosen/bootpath property
+" /chosen" find-package  if                       ( phandle )
+  " bootpath" rot  get-package-property  0=  if   ( propval\$ )
+    get-encoded-string                            ( bootpath\$ )
+    [char] \ left-parse-string  2nip              ( dn\$ )
+
+    \ store the first part of bootpath (up to the '\\') in \$DN
+    dn-buf place                                  ( )
+  then
+then
+
 " ro root=${r} ${rfs} video=lxfb fbcon=font:SUN12x22" to boot-file
 game-key-mask h# 80 and if
 	\\ boot from backup kernel
-	" ${dev}:\\vmlinuz.old" to boot-device
-	" ${dev}:\\initrd.img.old" to ramdisk
+	" \${DN}\\vmlinuz.old" expand\$ to boot-device
+	" \${DN}\\initrd.img.old" expand\$ to ramdisk
 else
 	\\ boot from regular kernel
-	" ${dev}:\\vmlinuz" to boot-device
-	" ${dev}:\\initrd.img" to ramdisk
+	" \${DN}\\vmlinuz" expand\$ to boot-device
+	" \${DN}\\initrd.img" expand\$ to ramdisk
 then
 boot
 EOF