Index: branches/azimutz/trunkGraphicsEnablerModules/i386/boot2/drivers.c
===================================================================
--- branches/azimutz/trunkGraphicsEnablerModules/i386/boot2/drivers.c	(revision 1222)
+++ branches/azimutz/trunkGraphicsEnablerModules/i386/boot2/drivers.c	(revision 1223)
@@ -746,14 +746,15 @@
   
     if (length == -1) return -1;
 
-#if 0   /** remove this check. **/   
-    if (strcmp(XMLCastString(XMLGetProperty(moduleDict, kPropOSBundleRequired)), "Safe Boot") == 0)
+    
+    if (!(gBootMode & kBootModeSafe) &&
+        XMLGetProperty(moduleDict, kPropOSBundleRequired) && 
+        strcmp(XMLCastString(XMLGetProperty(moduleDict, kPropOSBundleRequired)), "Safe Boot") == 0)
     {
-        // Don't load Safe Boot kexts. NOTE: -x should be check too.
+        // Don't load Safe Boot kexts if -x not specified.
         XMLFreeTag(moduleDict);
         return -2;
     }
-#endif 
 
     tmpModule = malloc(sizeof(Module));
     if (tmpModule == 0)
Index: branches/azimutz/trunkGraphicsEnablerModules/i386/boot2/boot.c
===================================================================
--- branches/azimutz/trunkGraphicsEnablerModules/i386/boot2/boot.c	(revision 1222)
+++ branches/azimutz/trunkGraphicsEnablerModules/i386/boot2/boot.c	(revision 1223)
@@ -604,14 +604,7 @@
 				verbose("Kernel cache did not load %s\n ", bootFile);
             }
             
-            if (checkOSVersion("10.7"))
-            {
-                bootFile = gBootKernelCacheFile;
-            }
-            else
-            {
-                sprintf(bootFile, "/%s", bootInfo->bootFile);
-            }
+            bootFile = bootInfo->bootFile;
             
             // Try to load kernel image from alternate locations on boot helper partitions.
             sprintf(bootFileSpec, "com.apple.boot.P%s", bootFile);

Property changes on: branches/azimutz/trunkGraphicsEnablerModules/package/Resources/Russian.lproj/Localizable.strings
___________________________________________________________________
Deleted: svn:mime-type
   - application/octet-stream


Property changes on: branches/azimutz/trunkGraphicsEnablerModules
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r1215-1222