Index: branches/ErmaC/Enoch/i386/boot2/drivers.c =================================================================== --- branches/ErmaC/Enoch/i386/boot2/drivers.c (revision 2707) +++ branches/ErmaC/Enoch/i386/boot2/drivers.c (revision 2708) @@ -253,7 +253,7 @@ } else { - if ( MAVERICKS || YOSEMITE ) // ( MAVERICKS || YOSEMITE || GALA ) // issue 352 + if ( MAVERICKS || YOSEMITE || ELCAPITAN ) // issue 352 { strlcpy(gExtensionsSpec, dirSpec, 4087); /* 4096 - sizeof("Library/") */ strcat(gExtensionsSpec, "Library/"); Index: branches/ErmaC/Enoch/i386/boot2/boot.c =================================================================== --- branches/ErmaC/Enoch/i386/boot2/boot.c (revision 2707) +++ branches/ErmaC/Enoch/i386/boot2/boot.c (revision 2708) @@ -318,7 +318,7 @@ } else { - // Lion, Mountain Lion, Mavericks and Yosemite prelink kernel cache file + // Lion, Mountain Lion, Mavericks, Yosemite and El Capitan prelink kernel cache file // for 10.7 10.8 10.9 10.10 10.11 snprintf(kernelCacheFile, sizeof(kernelCacheFile), "%skernelcache", kDefaultCachePathSnow); verbose("Kernel Cache file path (Mac OS X 10.7 and newer): %s\n", kernelCacheFile); @@ -772,13 +772,13 @@ // bootFile must start with a / if it not start with a device name if (!bootFileWithDevice && (bootInfo->bootFile)[0] != '/') { - if ( !YOSEMITE ) // ( !YOSEMITE || !GALA ) Is not Yosemite 10.10 or Gala 10.11 + if ( !YOSEMITE || !ELCAPITAN ) //Is not Yosemite 10.10 or El Capitan 10.11 { snprintf(bootFile, sizeof(bootFile), "/%s", bootInfo->bootFile); // append a leading / } else { - snprintf(bootFile, sizeof(bootFile), kDefaultKernelPathForYos"%s", bootInfo->bootFile); // Yosemite + snprintf(bootFile, sizeof(bootFile), kDefaultKernelPathForYos"%s", bootInfo->bootFile); // Yosemite or El Capitan } } else Index: branches/ErmaC/Enoch/i386/boot2/boot.h =================================================================== --- branches/ErmaC/Enoch/i386/boot2/boot.h (revision 2707) +++ branches/ErmaC/Enoch/i386/boot2/boot.h (revision 2708) @@ -30,7 +30,7 @@ #include "libsaio.h" // OS X Versions -//#define GALA checkOSVersion("10.11") // Gala +#define ELCAPITAN checkOSVersion("10.11") // El Capitan #define YOSEMITE checkOSVersion("10.10") // Yosemite #define MAVERICKS checkOSVersion("10.9") // Mavericks #define MOUNTAIN_LION checkOSVersion("10.8") // Mountain Lion @@ -57,7 +57,7 @@ //kernel path #define kDefaultKernelPathPreYos "/" -#define kDefaultKernelPathForYos "/System/Library/Kernels/" //for Yosemite and newer +#define kDefaultKernelPathForYos "/System/Library/Kernels/" //for Yosemite and El Capitan /* * Keys used in system Boot.plist Index: branches/ErmaC/Enoch/i386/boot2/gui.c =================================================================== --- branches/ErmaC/Enoch/i386/boot2/gui.c (revision 2707) +++ branches/ErmaC/Enoch/i386/boot2/gui.c (revision 2708) @@ -54,8 +54,8 @@ iDeviceGeneric_o, iDeviceHFS, iDeviceHFS_o, -// iDeviceHFS_gala, -// iDeviceHFS_gala_o, +// iDeviceHFS_capitan, +// iDeviceHFS_capitan_o, iDeviceHFS_yos, iDeviceHFS_yos_o, iDeviceHFS_mav, @@ -73,8 +73,8 @@ iDeviceHFSRAID, iDeviceHFSRAID_o, -// iDeviceHFSRAID_gala, -// iDeviceHFSRAID_gala_o, +// iDeviceHFSRAID_capitan, +// iDeviceHFSRAID_capitan_o, iDeviceHFSRAID_yos, iDeviceHFSRAID_yos_o, iDeviceHFSRAID_mav, @@ -95,8 +95,8 @@ iDeviceHFSFUSION, iDeviceHFSFUSION_o, -// iDeviceHFSFUSION_gala, -// iDeviceHFSFUSION_gala_o, +// iDeviceHFSFUSION_capitan, +// iDeviceHFSFUSION_capitan_o, iDeviceHFSFUSION_yos, iDeviceHFSFUSION_yos_o, iDeviceHFSFUSION_mav, @@ -159,8 +159,8 @@ {.name = "device_generic_o", .image = NULL}, {.name = "device_hfsplus", .image = NULL}, {.name = "device_hfsplus_o", .image = NULL}, -// {.name = "device_hfsplus_gala", .image = NULL}, -// {.name = "device_hfsplus_gala_o", .image = NULL}, +// {.name = "device_hfsplus_capitan", .image = NULL}, +// {.name = "device_hfsplus_capitan_o", .image = NULL}, {.name = "device_hfsplus_yos", .image = NULL}, {.name = "device_hfsplus_yos_o", .image = NULL}, {.name = "device_hfsplus_mav", .image = NULL}, @@ -178,8 +178,8 @@ {.name = "device_hfsraid", .image = NULL}, {.name = "device_hfsraid_o", .image = NULL}, -// {.name = "device_hfsraid_gala", .image = NULL}, -// {.name = "device_hfsraid_gala_o", .image = NULL}, +// {.name = "device_hfsraid_capitan", .image = NULL}, +// {.name = "device_hfsraid_capitan_o", .image = NULL}, {.name = "device_hfsraid_yos", .image = NULL}, {.name = "device_hfsraid_yos_o", .image = NULL}, {.name = "device_hfsraid_mav", .image = NULL}, @@ -200,8 +200,8 @@ {.name = "device_hfsfusion", .image = NULL}, {.name = "device_hfsfusion_o", .image = NULL}, -// {.name = "device_hfsfusion_gala", .image = NULL}, -// {.name = "device_hfsfusion_gala_o", .image = NULL}, +// {.name = "device_hfsfusion_capitan", .image = NULL}, +// {.name = "device_hfsfusion_capitan_o", .image = NULL}, {.name = "device_hfsfusion_yos", .image = NULL}, {.name = "device_hfsfusion_yos_o", .image = NULL}, {.name = "device_hfsfusion_mav", .image = NULL}, @@ -416,8 +416,8 @@ LOADPNG(device_generic_o, iDeviceGeneric); LOADPNG(device_hfsplus, iDeviceGeneric); LOADPNG(device_hfsplus_o, iDeviceHFS); -// LOADPNG(device_hfsplus_gala, iDeviceHFS); -// LOADPNG(device_hfsplus_gala_o, iDeviceHFS_gala); +// LOADPNG(device_hfsplus_capitan, iDeviceHFS); +// LOADPNG(device_hfsplus_capitan_o, iDeviceHFS_capitan); LOADPNG(device_hfsplus_yos, iDeviceHFS); LOADPNG(device_hfsplus_yos_o, iDeviceHFS_yos); LOADPNG(device_hfsplus_mav, iDeviceHFS); @@ -435,8 +435,8 @@ LOADPNG(device_hfsraid, iDeviceHFS); LOADPNG(device_hfsraid_o, iDeviceHFSRAID); -// LOADPNG(device_hfsraid_gala, iDeviceHFSRAID); -// LOADPNG(device_hfsraid_gala_o, iDeviceHFSRAID_gala); +// LOADPNG(device_hfsraid_capitan, iDeviceHFSRAID); +// LOADPNG(device_hfsraid_capitan_o, iDeviceHFSRAID_capitan); LOADPNG(device_hfsraid_yos, iDeviceHFSRAID); LOADPNG(device_hfsraid_yos_o, iDeviceHFSRAID_yos); LOADPNG(device_hfsraid_mav, iDeviceHFSRAID); @@ -457,8 +457,8 @@ LOADPNG(device_hfsfusion, iDeviceHFS); LOADPNG(device_hfsfusion_o, iDeviceHFSFUSION); -// LOADPNG(device_hfsfusion_gala, iDeviceHFSFUSION); -// LOADPNG(device_hfsfusion_gala_o, iDeviceHFSFUSION_gala); +// LOADPNG(device_hfsfusion_capitan, iDeviceHFSFUSION); +// LOADPNG(device_hfsfusion_capitan_o, iDeviceHFSFUSION_capitan); LOADPNG(device_hfsfusion_yos, iDeviceHFSFUSION); LOADPNG(device_hfsfusion_yos_o, iDeviceHFSFUSION_yos); LOADPNG(device_hfsfusion_mav, iDeviceHFSFUSION); @@ -1114,10 +1114,10 @@ devicetype = (device->flags & kBVFlagBooter ? iDeviceHFSRAID_yos : iDeviceHFS_yos); break; } - //if (device->OSVersion[4] == '1') { // 10.11 - // devicetype = (device->flags & kBVFlagBooter ? iDeviceHFSRAID_??? : iDeviceHFS_???); - // break; - //} + if (device->OSVersion[4] == '1') { // 10.11 + devicetype = (device->flags & kBVFlagBooter ? iDeviceHFSRAID_yos : iDeviceHFS_yos); // El Capitan + break; + } default: devicetype = (device->flags & kBVFlagBooter ? iDeviceHFSRAID : iDeviceHFS); break;