Chameleon

Chameleon Commit Details

Date:2011-06-28 09:09:15 (8 years 19 days ago)
Author:Azimutz
Commit:1093
Parents: 1092
Message:Disable some verbose.
Changes:
M/branches/azimutz/Chazi/i386/boot2/options.c
M/branches/azimutz/Chazi/i386/boot2/drivers.c
M/branches/azimutz/Chazi/i386/boot2/boot.c

File differences

branches/azimutz/Chazi/i386/boot2/drivers.c
279279
280280
281281
282
282
283283
284284
285285
{
ret = GetFileInfo(dirSpec, "Extensions", &flags, &time2);
msglog("(%s) Extensions time +1 = %d\n", __FUNCTION__, time2 + 1); //Azi: mine!
//msglog("(%s) Extensions time +1 = %d\n", __FUNCTION__, time2 + 1); //Azi: don't delete the one below, you...!
if ((ret != 0)
|| ((flags & kFileTypeMask) != kFileTypeDirectory)
branches/azimutz/Chazi/i386/boot2/boot.c
590590
591591
592592
593
593
594594
595595
596596
597597
598
598
599599
600600
601
601
602602
603
603
604604
605605
606606
607
607
608608
609609
610610
611611
612612
613
613
614614
615615
616616
617617
618618
619
619
620620
621621
622622
// kextcache_main.c: Construct entry from UUID of boot volume...(reminder)
// assemble ?string? to generate adler from...
//sprintf(gCacheNameAdler + 64, "%s,%s", gRootDevice, bootInfo->bootFile);
//sprintf(gCacheNameAdler + 64, "%s,%s", gRootDevice, bootInfo->bootFile); - OLD
const char *ProductName = getStringForKey("SMproductname", &bootInfo->smbiosConfig);
sprintf(gCacheNameAdler, ProductName); // well, at least the smbios.plist can be loaded this early...
// to set/get "ProductName" this early, booter needs complete rewrite!!
// see DHP's Revolution booter rework example!
verbose("KC: gCacheNameAdler 1 = %s\n", gCacheNameAdler);
//verbose("KC: gCacheNameAdler 1 = %s\n", gCacheNameAdler);
//Azi: check the validity of this, e.g. on Helper Partitions
sprintf(gCacheNameAdler + 64, "%s", "\\System\\Library\\CoreServices\\boot.efi");
verbose("KC: gCacheNameAdler 2 = %s\n", gCacheNameAdler + 64);
//verbose("KC: gCacheNameAdler 2 = %s\n", gCacheNameAdler + 64);
sprintf(gCacheNameAdler + (64 + 38), "%s", bootInfo->bootFile);
verbose("KC: gCacheNameAdler 3 = %s\n", gCacheNameAdler + (64 + 38));
//verbose("KC: gCacheNameAdler 3 = %s\n", gCacheNameAdler + (64 + 38));
// generate adler
adler32 = Adler32((unsigned char *)gCacheNameAdler, sizeof(gCacheNameAdler));
verbose("KC: Adler32 = %08X\n", adler32);
//verbose("KC: Adler32 = %08X\n", adler32);
//Azi: no check for OS version here ?? - yes there is :)
// append arch and/or adler (checksum) to kc path...
if (gMacOSVersion[3] <= '5')
{
sprintf(gBootKernelCacheFile, "%s.%08lX", kCachePathTigerLeopard, adler32);
verbose("KC: adler added to path = %s\n", gBootKernelCacheFile);
//verbose("KC: adler added to path = %s\n", gBootKernelCacheFile);
}
else
{
sprintf(gBootKernelCacheFile, "%s_%s.%08X", kCachePathSnowLion,
(archCpuType == CPU_TYPE_I386) ? "i386" : "x86_64", adler32);
verbose("KC: arch & adler added to path = %s\n", gBootKernelCacheFile);
//verbose("KC: arch & adler added to path = %s\n", gBootKernelCacheFile);
}
}
branches/azimutz/Chazi/i386/boot2/options.c
13771377
13781378
13791379
1380
1380
13811381
13821382
13831383
strncpy(&argP[cnt], cp, userCnt);
verbose("BootArgs = %s\n", argP); //Azi: checking...
argP[cnt+userCnt] = '\0'; // shouldn't this null argP ?? see getOSVersion***
verbose("BootArgs check = %s\n", argP); // ||
verbose("Re-check BootArgs = %s\n", argP); // ||
if (!shouldboot)
{

Archive Download the corresponding diff file

Revision: 1093