[OpenBIOS] r574 - trunk/openbios-devel/modules

[svn at openbios.org]

Author: laurent
Date: 2009-08-31 01:37:42 +0200 (Mon, 31 Aug 2009)
New Revision: 574

Modified:
   trunk/openbios-devel/modules/disk-label.c
Log:
Remove useless openSUSE hack.

This hack was needed because we were using the IBM bootscript (ppc/bootinfo.txt)
with an HFS+ filesystem (whereas bootscript was using ISO9660 partition number)

The newworld_boot() function uses now the Apple bootscript (suseboot/os-chooser)
with the correct partition number.
 
Signed-off-by: Laurent Vivier <Laurent at vivier.eu>



Modified: trunk/openbios-devel/modules/disk-label.c
===================================================================
--- trunk/openbios-devel/modules/disk-label.c	2009-08-29 21:09:21 UTC (rev 573)
+++ trunk/openbios-devel/modules/disk-label.c	2009-08-30 23:37:42 UTC (rev 574)
@@ -93,37 +93,6 @@
 	}
 	DPRINTF("filename %s\n", filename);
 
-	/* try to see if there is a filesystem without partition,
-	 * like ISO9660. This is needed to boot openSUSE 11.1 CD
-	 * which uses "boot &device;:1,\suseboot\yaboot.ibm"
-	 * whereas HFS+ partition is #2
-	 */
-
-	if ( atol(path) == 1 ) {
-		PUSH_ih( my_self() );
-		selfword("find-filesystem");
-		ph = POP_ph();
-		if( ph ) {
-			di->offs_hi = 0;
-			di->offs_lo = 0;
-			di->size_hi = 0;
-			di->size_lo = 0;
-			di->part_ih = 0;
-			di->type = -1;
-			di->block_size = 512;
-			xt = find_parent_method("block-size");
-			if (xt) {
-				call_parent(xt);
-				di->block_size = POP();
-			}
-			push_str( filename );
-			PUSH_ph( ph );
-			fword("interpose");
-			success = 1;
-			goto out;
-		}
-	}
-
 	/* find partition handler */
 	seek_io( fd, 0 );
 	if( read_io(fd, block0, sizeof(block0)) != sizeof(block0) )