r831 - cpu/x86/pc/olpc

Author: wmb
Date: 2008-06-03 08:53:04 +0200 (Tue, 03 Jun 2008)
New Revision: 831

Modified:
   cpu/x86/pc/olpc/fsupdate.fth
Log:
OLPC trac 7141 - improved error messages for secure FS update.

Modified: cpu/x86/pc/olpc/fsupdate.fth
===================================================================
--- cpu/x86/pc/olpc/fsupdate.fth	2008-05-28 19:15:45 UTC (rev 830)
+++ cpu/x86/pc/olpc/fsupdate.fth	2008-06-03 06:53:04 UTC (rev 831)
@@ -83,7 +83,7 @@
 : erase-all  ( -- )
    #nand-pages >eblock#  show-erasing
    ['] show-bad  ['] show-erased  ['] show-bbt-block " (wipe)" $call-nand
-\   #image-eblocks show-writing
+   #image-eblocks show-writing
 ;

: eblock: ( "eblock#" "hashname" "hash-of-128KiB" -- )
@@ -96,6 +96,7 @@
       drop 
    else                                        ( eblock# )
       ." Bad hash for eblock# " .x cr
+      cr ." Your USB key may be bad.  Please try a different one." cr cr
       abort
    then                                        ( )

@@ -145,7 +146,7 @@
 \    clear-context  nand-commands
 also nand-commands

-   ['] include-buffer  catch  if  nip nip  .error  security-failure  then
+   ['] include-buffer  catch  ?dup  if  nip nip  .error  security-failure  then

previous
 \    only forth also definitions