Index: trunk/i386/boot2/boot.c =================================================================== --- trunk/i386/boot2/boot.c (revision 1710) +++ trunk/i386/boot2/boot.c (revision 1711) @@ -182,17 +182,7 @@ } usb_loop(); - - // Notify modules that the kernel is about to be started - if (checkOSVersion("10.7")) - { - execute_hook("Kernel Start", (void*)kernelEntry, (void*)bootArgs, NULL, NULL); - } - else - { - execute_hook("Kernel Start", (void*)kernelEntry, (void*)bootArgsPreLion, NULL, NULL); - } - + // If we were in text mode, switch to graphics mode. // This will draw the boot graphics unless we are in // verbose mode. @@ -208,6 +198,9 @@ // Jump to kernel's entry point. There's no going back now. if (checkOSVersion("10.7")) { + // Notify modules that the kernel is about to be started + execute_hook("Kernel Start", (void*)kernelEntry, (void*)bootArgs, NULL, NULL); + // Masking out so that Lion doesn't doublefault outb(0x21, 0xff); /* Maskout all interrupts Pic1 */ outb(0xa1, 0xff); /* Maskout all interrupts Pic2 */ @@ -215,6 +208,9 @@ startprog( kernelEntry, bootArgs ); } else { + // Notify modules that the kernel is about to be started + execute_hook("Kernel Start", (void*)kernelEntry, (void*)bootArgsPreLion, NULL, NULL); + startprog( kernelEntry, bootArgsPreLion ); }