Index: branches/ErmaC/Enoch/i386/boot2/boot.h =================================================================== --- branches/ErmaC/Enoch/i386/boot2/boot.h (revision 2830) +++ branches/ErmaC/Enoch/i386/boot2/boot.h (revision 2831) @@ -30,6 +30,7 @@ #include "libsaio.h" // OS X Versions +#define SIERRA checkOSVersion("10.12") // Sierra #define ELCAPITAN checkOSVersion("10.11") // El Capitan #define YOSEMITE checkOSVersion("10.10") // Yosemite #define MAVERICKS checkOSVersion("10.9") // Mavericks Index: branches/ErmaC/Enoch/i386/boot2/gui.c =================================================================== --- branches/ErmaC/Enoch/i386/boot2/gui.c (revision 2830) +++ branches/ErmaC/Enoch/i386/boot2/gui.c (revision 2831) @@ -54,7 +54,8 @@ iDeviceGeneric_o, iDeviceHFS, iDeviceHFS_o, - + iDeviceHFS_sie, + iDeviceHFS_sie_o, iDeviceHFS_cap, iDeviceHFS_cap_o, iDeviceHFS_yos, @@ -74,6 +75,8 @@ iDeviceHFSRAID, iDeviceHFSRAID_o, + iDeviceHFSRAID_sie, + iDeviceHFSRAID_sie_o, iDeviceHFSRAID_cap, iDeviceHFSRAID_cap_o, iDeviceHFSRAID_yos, @@ -96,6 +99,8 @@ iDeviceHFSFUSION, iDeviceHFSFUSION_o, + iDeviceHFSFUSION_sie, + iDeviceHFSFUSION_sie_o, iDeviceHFSFUSION_cap, iDeviceHFSFUSION_cap_o, iDeviceHFSFUSION_yos, @@ -160,7 +165,8 @@ {.name = "device_generic_o", .image = NULL}, {.name = "device_hfsplus", .image = NULL}, {.name = "device_hfsplus_o", .image = NULL}, - + {.name = "device_hfsplus_sie", .image = NULL}, + {.name = "device_hfsplus_sie_o", .image = NULL}, {.name = "device_hfsplus_cap", .image = NULL}, {.name = "device_hfsplus_cap_o", .image = NULL}, {.name = "device_hfsplus_yos", .image = NULL}, @@ -180,6 +186,8 @@ {.name = "device_hfsraid", .image = NULL}, {.name = "device_hfsraid_o", .image = NULL}, + {.name = "device_hfsraid_sie", .image = NULL}, + {.name = "device_hfsraid_sie_o", .image = NULL}, {.name = "device_hfsraid_cap", .image = NULL}, {.name = "device_hfsraid_cap_o", .image = NULL}, {.name = "device_hfsraid_yos", .image = NULL}, @@ -202,6 +210,8 @@ {.name = "device_hfsfusion", .image = NULL}, {.name = "device_hfsfusion_o", .image = NULL}, + {.name = "device_hfsfusion_sie", .image = NULL}, + {.name = "device_hfsfusion_sie_o", .image = NULL}, {.name = "device_hfsfusion_cap", .image = NULL}, {.name = "device_hfsfusion_cap_o", .image = NULL}, {.name = "device_hfsfusion_yos", .image = NULL}, @@ -419,6 +429,8 @@ LOADPNG(device_hfsplus, iDeviceGeneric); LOADPNG(device_hfsplus_o, iDeviceHFS); + LOADPNG(device_hfsplus_sie, iDeviceHFS); + LOADPNG(device_hfsplus_sie_o, iDeviceHFS_sie); LOADPNG(device_hfsplus_cap, iDeviceHFS); LOADPNG(device_hfsplus_cap_o, iDeviceHFS_cap); LOADPNG(device_hfsplus_yos, iDeviceHFS); @@ -438,6 +450,8 @@ LOADPNG(device_hfsraid, iDeviceHFS); LOADPNG(device_hfsraid_o, iDeviceHFSRAID); + LOADPNG(device_hfsraid_sie, iDeviceHFSRAID); + LOADPNG(device_hfsraid_sie_o, iDeviceHFSRAID_sie); LOADPNG(device_hfsraid_cap, iDeviceHFSRAID); LOADPNG(device_hfsraid_cap_o, iDeviceHFSRAID_cap); LOADPNG(device_hfsraid_yos, iDeviceHFSRAID); @@ -460,6 +474,8 @@ LOADPNG(device_hfsfusion, iDeviceHFS); LOADPNG(device_hfsfusion_o, iDeviceHFSFUSION); + LOADPNG(device_hfsfusion_sie, iDeviceHFSFUSION); + LOADPNG(device_hfsfusion_sie_o, iDeviceHFSFUSION_sie); LOADPNG(device_hfsfusion_cap, iDeviceHFSFUSION); LOADPNG(device_hfsfusion_cap_o, iDeviceHFSFUSION_cap); LOADPNG(device_hfsfusion_yos, iDeviceHFSFUSION); @@ -1121,6 +1137,10 @@ devicetype = (device->flags & kBVFlagBooter ? iDeviceHFSRAID_cap : iDeviceHFS_cap); // El Capitan break; } + if (device->OSVersion[4] == '2') { // 10.12 + devicetype = (device->flags & kBVFlagBooter ? iDeviceHFSRAID_sie : iDeviceHFS_sie); // Sierra + break; + } default: devicetype = (device->flags & kBVFlagBooter ? iDeviceHFSRAID : iDeviceHFS); break;