Loading...
--- xnu/xnu-1228/iokit/bsddev/IOKitBSDInit.cpp
+++ xnu/xnu-517/iokit/bsddev/IOKitBSDInit.cpp
@@ -1,19 +1,16 @@
/*
* Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
*
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * @APPLE_LICENSE_HEADER_START@
+ *
+ * Copyright (c) 1999-2003 Apple Computer, Inc. All Rights Reserved.
*
* This file contains Original Code and/or Modifications of Original Code
* as defined in and that are subject to the Apple Public Source License
* Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- *
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
*
* The Original Code and all software distributed under the License are
* distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
@@ -23,7 +20,7 @@
* Please see the License for the specific language governing rights and
* limitations under the License.
*
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ * @APPLE_LICENSE_HEADER_END@
*/
#include <IOKit/IOBSD.h>
#include <IOKit/IOLib.h>
@@ -32,11 +29,12 @@
#include <IOKit/IOKitKeys.h>
#include <IOKit/IOPlatformExpert.h>
+#include <sys/disklabel.h>
+
extern "C" {
#include <pexpert/pexpert.h>
#include <kern/clock.h>
-#include <uuid/uuid.h>
// how long to wait for matching root device, secs
#define ROOTDEVICETIMEOUT 60
@@ -80,12 +78,6 @@
return( 0 );
}
-OSDictionary * IOUUIDMatching( void )
-{
- return IOService::resourceMatching( "boot-uuid-media" );
-}
-
-
OSDictionary * IOCDMatching( void )
{
OSDictionary * dict;
@@ -168,8 +160,7 @@
OSDictionary * matching;
OSDictionary * propDict = 0;
const OSSymbol * str = 0;
- char networkType[128];
-
+
do {
matching = IOService::serviceMatching( "IONetworkInterface" );
if ( matching == 0 )
@@ -186,18 +177,6 @@
propDict->setObject( "IOInterfaceNamePrefix", (OSObject *) str );
str->release();
str = 0;
-
- // see if we're contrained to netroot off of specific network type
- if(PE_parse_boot_argn( "network-type", networkType, 128 ))
- {
- str = OSSymbol::withCString( networkType );
- if(str)
- {
- propDict->setObject( "IONetworkRootType", str);
- str->release();
- str = 0;
- }
- }
if ( matching->setObject( gIOPropertyMatchKey,
(OSObject *) propDict ) != true )
@@ -279,6 +258,7 @@
long partition = -1;
long lun = -1;
char c;
+ const char * partitionSep = NULL;
// scan the tail of the path for "@unit:partition"
do {
@@ -292,12 +272,24 @@
if( *(--look) == c) {
if( c == ':') {
partition = strtol( look + 1, 0, 0 );
+ partitionSep = look;
c = '@';
} else if( c == '@') {
- unit = strtol( look + 1, &comp, 16 );
-
- if( *comp == ',') {
- lun = strtol( comp + 1, 0, 16 );
+ int diff = -1;
+
+ unit = strtol( look + 1, 0, 16 );
+
+ diff = (int)partitionSep - (int)look;
+ if ( diff > 0 ) {
+
+ for ( ; diff > 0; diff-- )
+ {
+ if( look[diff] == ',' )
+ {
+ lun = strtol ( &look[diff + 1], 0, 16 );
+ break;
+ }
+ }
}
c = '/';
@@ -354,53 +346,11 @@
OSDictionary * IOOFPathMatching( const char * path, char * buf, int maxLen )
{
- OSDictionary * matching;
- OSString * str;
- char * comp;
- int len;
-
/* need to look up path, get device type,
call matching help based on device type */
- matching = IODiskMatching( path, buf, maxLen );
- if( matching)
- return( matching );
-
- do {
-
- len = strlen( kIODeviceTreePlane ":" );
- maxLen -= len;
- if( maxLen < 0)
- continue;
-
- strcpy( buf, kIODeviceTreePlane ":" );
- comp = buf + len;
-
- len = strlen( path );
- maxLen -= len;
- if( maxLen < 0)
- continue;
- strncpy( comp, path, len );
- comp[ len ] = 0;
-
- matching = OSDictionary::withCapacity( 1 );
- if( !matching)
- continue;
-
- str = OSString::withCString( buf );
- if( !str)
- continue;
- matching->setObject( kIOPathMatchKey, str );
- str->release();
-
- return( matching );
-
- } while( false );
-
- if( matching)
- matching->release();
-
- return( 0 );
+ return( IODiskMatching( path, buf, maxLen ));
+
}
IOService * IOFindMatchingChild( IOService * service )
@@ -454,9 +404,8 @@
UInt32 *ramdParms = 0;
UInt32 flags = 0;
- int mnr, mjr;
+ int minor, major;
bool findHFSChild = false;
- char * mediaProperty = 0;
char * rdBootVar;
enum { kMaxPathBuf = 512, kMaxBootVar = 128 };
char * str;
@@ -464,11 +413,10 @@
int len;
bool forceNet = false;
bool debugInfoPrintedOnce = false;
- const char * uuidStr = NULL;
static int mountAttempts = 0;
- int xchar, dchar;
+ int xchar, dchar;
if( mountAttempts++)
@@ -479,52 +427,24 @@
return( kIOReturnNoMemory );
rdBootVar = str + kMaxPathBuf;
- if (!PE_parse_boot_argn("rd", rdBootVar, kMaxBootVar )
- && !PE_parse_boot_argn("rootdev", rdBootVar, kMaxBootVar ))
+ if (!PE_parse_boot_arg("rd", rdBootVar )
+ && !PE_parse_boot_arg("rootdev", rdBootVar ))
rdBootVar[0] = 0;
do {
- if( (regEntry = IORegistryEntry::fromPath( "/chosen", gIODTPlane ))) {
- data = OSDynamicCast(OSData, regEntry->getProperty( "root-matching" ));
- if (data) {
- matching = OSDynamicCast(OSDictionary, OSUnserializeXML((char *)data->getBytesNoCopy()));
- if (matching) {
- continue;
- }
- }
-
- data = (OSData *) regEntry->getProperty( "boot-uuid" );
- if( data) {
- uuidStr = (const char*)data->getBytesNoCopy();
- OSString *uuidString = OSString::withCString( uuidStr );
-
- // match the boot-args boot-uuid processing below
- if( uuidString) {
- IOLog("rooting via boot-uuid from /chosen: %s\n", uuidStr);
- IOService::publishResource( "boot-uuid", uuidString );
- uuidString->release();
- matching = IOUUIDMatching();
- mediaProperty = "boot-uuid-media";
- regEntry->release();
- continue;
- } else {
- uuidStr = NULL;
+ if( (regEntry = IORegistryEntry::fromPath( "/chosen", gIODTPlane ))) {
+ data = (OSData *) regEntry->getProperty( "rootpath" );
+ regEntry->release();
+ if( data) continue;
}
- }
-
- // else try for an OF Path
- data = (OSData *) regEntry->getProperty( "rootpath" );
- regEntry->release();
- if( data) continue;
- }
if( (regEntry = IORegistryEntry::fromPath( "/options", gIODTPlane ))) {
- data = (OSData *) regEntry->getProperty( "boot-file" );
- regEntry->release();
- if( data) continue;
- }
+ data = (OSData *) regEntry->getProperty( "boot-file" );
+ regEntry->release();
+ if( data) continue;
+ }
} while( false );
- if( data && !uuidStr)
+ if( data)
look = (const char *) data->getBytesNoCopy();
if( rdBootVar[0] == '*') {
@@ -592,12 +512,10 @@
// from OpenFirmware path
IOLog("From path: \"%s\", ", look);
- if (!matching) {
- if( forceNet || (0 == strncmp( look, "enet", strlen( "enet" ))) ) {
- matching = IONetworkMatching( look, str, kMaxPathBuf );
- } else {
- matching = IODiskMatching( look, str, kMaxPathBuf );
- }
+ if( forceNet || (0 == strncmp( look, "enet", strlen( "enet" ))) ) {
+ matching = IONetworkMatching( look, str, kMaxPathBuf );
+ } else {
+ matching = IODiskMatching( look, str, kMaxPathBuf );
}
}
@@ -612,35 +530,14 @@
} else if ( strncmp( look, "cdrom", strlen( "cdrom" )) == 0 ) {
matching = IOCDMatching();
findHFSChild = true;
- } else if ( strncmp( look, "uuid", strlen( "uuid" )) == 0 ) {
- char *uuid;
- OSString *uuidString;
-
- uuid = (char *)IOMalloc( kMaxBootVar );
-
- if ( uuid ) {
- if (!PE_parse_boot_argn( "boot-uuid", uuid, kMaxBootVar )) {
- panic( "rd=uuid but no boot-uuid=<value> specified" );
- }
- uuidString = OSString::withCString( uuid );
- if ( uuidString ) {
- IOService::publishResource( "boot-uuid", uuidString );
- uuidString->release();
- IOLog( "\nWaiting for boot volume with UUID %s\n", uuid );
- matching = IOUUIDMatching();
- mediaProperty = "boot-uuid-media";
- }
- IOFree( uuid, kMaxBootVar );
- }
} else {
matching = IOBSDNameMatching( look );
}
}
if( !matching) {
- OSString * astring;
- // Match any HFS media
-
+ OSString * astring;
+ // any HFS
matching = IOService::serviceMatching( "IOMedia" );
astring = OSString::withCStringNoCopy("Apple_HFS");
if ( astring ) {
@@ -699,12 +596,10 @@
// look for a subservice with an Apple_HFS child
IOService * subservice = IOFindMatchingChild( service );
if ( subservice ) service = subservice;
- } else if ( service && mediaProperty ) {
- service = (IOService *)service->getProperty(mediaProperty);
- }
-
- mjr = 0;
- mnr = 0;
+ }
+
+ major = 0;
+ minor = 0;
// If the IOService we matched to is a subclass of IONetworkInterface,
// then make sure it has been registered with BSD and has a BSD name
@@ -728,10 +623,10 @@
strcpy( rootName, iostr->getCStringNoCopy() );
off = (OSNumber *) service->getProperty( kIOBSDMajorKey );
if( off)
- mjr = off->unsigned32BitValue();
+ major = off->unsigned32BitValue();
off = (OSNumber *) service->getProperty( kIOBSDMinorKey );
if( off)
- mnr = off->unsigned32BitValue();
+ minor = off->unsigned32BitValue();
if( service->metaCast( "IONetworkInterface" ))
flags |= 1;
@@ -744,12 +639,12 @@
}
IOLog( "BSD root: %s", rootName );
- if( mjr)
- IOLog(", major %d, minor %d\n", mjr, mnr );
+ if( major)
+ IOLog(", major %d, minor %d\n", major, minor );
else
IOLog("\n");
- *root = makedev( mjr, mnr );
+ *root = makedev( major, minor );
*oflags = flags;
IOFree( str, kMaxPathBuf + kMaxBootVar );
@@ -773,20 +668,6 @@
return( kIOReturnSuccess );
}
-void IOSecureBSDRoot(const char * rootName)
-{
-#if CONFIG_EMBEDDED
- IOPlatformExpert *pe;
- const OSSymbol *functionName = OSSymbol::withCStringNoCopy("SecureRootName");
-
- while ((pe = IOService::getPlatform()) == 0) IOSleep(1 * 1000);
-
- pe->callPlatformFunction(functionName, false, (void *)rootName, (void *)0, (void *)0, (void *)0);
-
- functionName->release();
-#endif
-}
-
void *
IOBSDRegistryEntryForDeviceTree(char * path)
{
@@ -818,20 +699,4 @@
return (NULL);
}
-kern_return_t IOBSDGetPlatformUUID( uuid_t uuid, mach_timespec_t timeout )
-{
- IOService * resources;
- OSString * string;
-
- resources = IOService::waitForService( IOService::resourceMatching( kIOPlatformUUIDKey ), &timeout );
- if ( resources == 0 ) return KERN_OPERATION_TIMED_OUT;
-
- string = ( OSString * ) IOService::getPlatform( )->getProvider( )->getProperty( kIOPlatformUUIDKey );
- if ( string == 0 ) return KERN_NOT_SUPPORTED;
-
- uuid_parse( string->getCStringNoCopy( ), uuid );
-
- return KERN_SUCCESS;
-}
-
} /* extern "C" */