r468 - ofw/fs/fatfs

Author: wmb
Date: 2007-07-09 20:54:01 +0200 (Mon, 09 Jul 2007)
New Revision: 468

Modified:
   ofw/fs/fatfs/partition.fth
Log:
disk-label partition handler - Removed a kludge that caused the presence of
an ext2 partition to appear to be marked as bootable even if it wasn't.
The problem symptom was that on a disk with a FAT FS in partition 1 and an
EXT2 FS in partition 2, neither marked bootable, OFW would use partition 2
by default.

Modified: ofw/fs/fatfs/partition.fth
===================================================================
--- ofw/fs/fatfs/partition.fth	2007-07-08 18:59:17 UTC (rev 467)
+++ ofw/fs/fatfs/partition.fth	2007-07-09 18:54:01 UTC (rev 468)
@@ -102,12 +102,13 @@
 : is-ufs?  ( type -- type flag )  dup ufs-type =  ;

\ Matches partitions with the bootable flag set
-\ : bootable?  ( boot? type -- boot? type flag )  over h# 80 =  ;
-\ XXX kludge for Linux: bootable flag is not always set, accept ext2fs-type
-: bootable?  ( boot? type -- boot? type flag )
-   over h# 80 =  over h# 83 = or
-;
+: bootable?  ( boot? type -- boot? type flag )  over h# 80 =  ;

+\ Kludge for Linux: bootable flag is not always set, accept ext2fs-type
+\ : bootable?  ( boot? type -- boot? type flag )
+\    over h# 80 =  over h# 83 = or
+\ ;
+
 \ Matches the Nth partition, where N is initially stored in the value #part
 : nth?  ( -- flag )  #part 1- dup to #part  0=  ;