olpc.fth now always boots from whence it was loaded

1 files changed, 35 insertions, 9 deletions

diff --git a/soas-xo.ks b/soas-xo.ks
index 051460c..15433aa 100644
--- a/soas-xo.ks
+++ b/soas-xo.ks
@@ -45,16 +45,42 @@ yum-presto
 cat > /boot/olpc.fth <<EOF
 \ olpc.fth
 
-" root=mtd0 rootfstype=jffs2 console=tty0 console=ttyS0,115200 fbcon=font:SUN12x22" to boot-file
-" nand:\boot\vmlinuz" to boot-device
-" nand:\boot\initrd.img" to ramdisk
+: set-path-macros  ( -- )
+   button-o game-key?  if  " \boot-alt"  else  " \boot"  then  pn-buf place
+
+   " /chosen" find-package  if                       ( phandle )
+      " bootpath" rot  get-package-property  0=  if  ( propval$ )
+         get-encoded-string                          ( bootpath$ )
+         [char] \ left-parse-string  2nip            ( dn$ )
+         dn-buf place                                ( )
+      then
+   then
+
+   " nand"  dn-buf count  sindex  0>=   if
+      " root=mtd0 rootfstype=jffs2"
+   else
+      " root=LABEL=OLPCRoot"
+   then
+   " ROOTDEV" $set-macro
+;
+
+: olpc-fth-boot-me
+   set-path-macros
+   ?ofw-reflash
+   " ro ${ROOTDEV} console=ttyS0,115200 console=tty0 fbcon=font:SUN12x22" expand$ to boot-file
+   " ${DN}${PN}\vmlinuz"    expand$ to boot-device
+   " ${DN}${PN}\olpcrd.img" expand$ to ramdisk
+
+   setup-smbios
+   unfreeze
+   dcon-unfreeze
+   visible
+
+   boot
+;
+
+olpc-fth-boot-me
 
-setup-smbios
-unfreeze
-dcon-unfreeze
-visible
-
-boot
 EOF
 
 # END olpc.fth