Chameleon Commit Details - 28 - Chameleon open source boot loader project.

Date:

2010-01-23 20:16:14 (14 years 2 months ago)

Author:

Commit:

Parents:

Message:

Deprecated existing SystemID and SMUUID options, still parsed in RC5 but should be replace by the new SMsystemid in a future release see CHANGES for more info/justification.

Changes:

M	/trunk/doc/BootHelp.txt
M	/trunk/i386/libsaio/fake_efi.c
M	/trunk/CHANGES

File differences

-92
93 93
94 94
95
96
97
98
+    =Yes|No                 Fix rescan issues when using a DVD reader in AHCI mode. ␊
  Rescan=Yes                Enable CD-ROM rescan mode.␊
  "Rescan Prompt"=Yes       Prompts for enable CD-ROM rescan mode.␊
  SystemId=<UUID>␉    [DEPRECATED since RC5] Set manually the system id UUID,␊
  ␉␉␉    Please use SMBIOS config option "SMsystemid" instead.␊
␉␉␉    SMUUID in smbios config is also DEPRECATED ␊
␉␉␉    and won't be supported in next releases.␊
     =Yes|No                 Fix rescan issues when using a DVD reader in AHCI mode. ␊
   Rescan=Yes                Enable CD-ROM rescan mode.␊
   "Rescan Prompt"=Yes       Prompts for enable CD-ROM rescan mode.␊
+  SystemId=<UUID>␉    [DEPRECATED since RC5] Set manually the system id UUID,␊
+  ␉␉␉    Please use SMBIOS config option "SMsystemid" instead.␊
+␉␉␉    SMUUID in smbios config is also DEPRECATED ␊
+␉␉␉    and won't be supported in next releases.␊

-
2
3
1 4
2 5
3 6
+- Started to deprecate former system id uuid options: now encouraging to use SMsystemid because it follows smbios options naming convention, is not as vague as SMUUID, and should belong to smbios config, not bootConfig.␊
  For theses reasons, SystemId from bootConfig and SMUUID from smbiosConfig aer now DEPRECATED.␊
␊
- Integrated JrCs fadt patch (kept for RC5 the existing DSDT.aml  retry algo that disapeared in his patch, should be more discussed for RC6)␊
- Added JrCs modified convention name change to coding_standards␊
- Now malloc (ex. MALLOC in Asere patch) is renamed malloc(size) and is an alias ␊
+- Started to deprecate former system id uuid options: now encouraging to use SMsystemid because it follows smbios options naming convention, is not as vague as SMUUID, and should belong to smbios config, not bootConfig.␊
+  For theses reasons, SystemId from bootConfig and SMUUID from smbiosConfig aer now DEPRECATED.␊
+␊
 - Integrated JrCs fadt patch (kept for RC5 the existing DSDT.aml  retry algo that disapeared in his patch, should be more discussed for RC6)␊
 - Added JrCs modified convention name change to coding_standards␊
 - Now malloc (ex. MALLOC in Asere patch) is renamed malloc(size) and is an alias ␊

-467
468 468
469 469
470 
471 
470
471
472
473
474
472 475
476
477
473 478
479
480
481
482
474 483
484
475 485
476 486
477 487
+ * or from the bios if not, or from a fixed value if no bios value is found ␊
 */␊
static EFI_CHAR8* getSystemID()␊
{␉// unable to determine UUID for host. Error: 35 fix␊
    const char * sysId = getStringForKey("SystemID", &bootInfo->bootConfig);␊
{   // unable to determine UUID for host. Error: 35 fix␊
␊
    // Rek: new SMsystemid option conforming to smbios notation standards, this option should␊
    // belong to smbios config only ...␊
    const char * sysId = getStringForKey("SMsystemid", &bootInfo->smbiosConfig);␊
    EFI_CHAR8* ret = getUUIDFromString(sysId);␊
␊
    // Rek: Deprecated in RC5, will be REMOVED in RC6 (should not belong to bootConfig but smbiosConfig)␊
    if(!sysId || !ret)   // try smbios.plist SMUUID override␊
      ret=getUUIDFromString((sysId = getStringForKey("SystemId",&bootInfo->bootConfig)));␊
    ␊
    // Rek: Deprecated in RC5, will be REMOVED in RC6 (SMUUID name is too vague: there is more than one UUID in the system)␊
    if(!sysId || !ret)   // try smbios.plist SMUUID override␊
      ret=getUUIDFromString((sysId = getStringForKey("SMUUID",&bootInfo->smbiosConfig)));␊
␊
    if(!sysId || !ret)  { // try bios dmi info UUID extraction ␊
      ret = getSmbiosUUID();␊
      sysId=0;␊
  * or from the bios if not, or from a fixed value if no bios value is found ␊
  */␊
 static EFI_CHAR8* getSystemID()␊
-{␉// unable to determine UUID for host. Error: 35 fix␊
-    const char * sysId = getStringForKey("SystemID", &bootInfo->bootConfig);␊
+{   // unable to determine UUID for host. Error: 35 fix␊
+␊
+    // Rek: new SMsystemid option conforming to smbios notation standards, this option should␊
+    // belong to smbios config only ...␊
+    const char * sysId = getStringForKey("SMsystemid", &bootInfo->smbiosConfig);␊
     EFI_CHAR8* ret = getUUIDFromString(sysId);␊
+␊
+    // Rek: Deprecated in RC5, will be REMOVED in RC6 (should not belong to bootConfig but smbiosConfig)␊
     if(!sysId || !ret)   // try smbios.plist SMUUID override␊
+      ret=getUUIDFromString((sysId = getStringForKey("SystemId",&bootInfo->bootConfig)));␊
+    ␊
+    // Rek: Deprecated in RC5, will be REMOVED in RC6 (SMUUID name is too vague: there is more than one UUID in the system)␊
+    if(!sysId || !ret)   // try smbios.plist SMUUID override␊
       ret=getUUIDFromString((sysId = getStringForKey("SMUUID",&bootInfo->smbiosConfig)));␊
+␊
     if(!sysId || !ret)  { // try bios dmi info UUID extraction ␊
       ret = getSmbiosUUID();␊
       sysId=0;␊

Download the corresponding diff file