[openfirmware] r904 - cpu/x86/pc/olpc

[svn at openfirmware.info]

Author: wmb
Date: 2008-08-29 07:54:16 +0200 (Fri, 29 Aug 2008)
New Revision: 904

Modified:
   cpu/x86/pc/olpc/security.fth
Log:
Q2E15 (also included)
OLPC trac 8216 - Override persistent devkey when game-button-X is
pressed, so you can run customization keys on a system with the dk tag.


Modified: cpu/x86/pc/olpc/security.fth
===================================================================
--- cpu/x86/pc/olpc/security.fth	2008-08-28 23:28:34 UTC (rev 903)
+++ cpu/x86/pc/olpc/security.fth	2008-08-29 05:54:16 UTC (rev 904)
@@ -802,7 +802,10 @@
    2drop false                              ( )
 ;
 
-: persistent-devkey?  ( -- flag )  " dk" find-tag  dup  if  nip nip  then  ;
+: persistent-devkey?  ( -- flag )
+  button-x game-key?  if  false exit  then
+  " dk" find-tag  dup  if  nip nip  then
+;
 
 : all-devices$  ( -- list$ )  " disk: sd: nand:"  ;