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

Date:

2010-08-10 13:00:51 (13 years 8 months ago)

Author:

Azimutz

Commit:

348

Parents:

347

Message:

Implementing the lost config=/path-to-boot.plist key.

Changes:

M	/branches/azimutz/CleanCut/i386/boot2/options.c
M	/branches/azimutz/CleanCut/i386/libsaio/stringTable.c
M	/branches/azimutz/CleanCut/i386/boot2/boot.h

File differences

-650
651 651
652 652
653 
653
654
655
654 656
657
658
659
660
661
662
663
664
665
655 666
656 667
657 668
+ */␊
int loadOverrideConfig(config_file_t *config)␊
{␊
␉int␉␉␉ count, ret, fd;␊
␉char␉␉ dirSpecBplist[128] = ""; //Azi:alloc - reminder␊
␉const char␉*override_pathname = NULL;␊
␉int␉␉␉ count, ret, fd, len = 0;␊
␉␊
␉// Take in account user overriding the override :P␊
␉if (getValueForKey(kTestConfigKey, &override_pathname, &len, &bootInfo->bootConfig))␊
␉{␊
␉␉// Specify a path to a file, e.g. config=/Extra/test.plist␊
␉␉strcpy(dirSpecBplist, override_pathname);␊
␉␉fd = open(dirSpecBplist, 0);␊
␉␉if (fd >= 0) goto success_fd;␊
␉}␊
␉␊
success_fd:␊
␉␊
␉if (fd >= 0)␊
  */␊
 int loadOverrideConfig(config_file_t *config)␊
 {␊
-␉int␉␉␉ count, ret, fd;␊
+␉char␉␉ dirSpecBplist[128] = ""; //Azi:alloc - reminder␊
+␉const char␉*override_pathname = NULL;␊
+␉int␉␉␉ count, ret, fd, len = 0;␊
 ␉␊
+␉// Take in account user overriding the override :P␊
+␉if (getValueForKey(kTestConfigKey, &override_pathname, &len, &bootInfo->bootConfig))␊
+␉{␊
+␉␉// Specify a path to a file, e.g. config=/Extra/test.plist␊
+␉␉strcpy(dirSpecBplist, override_pathname);␊
+␉␉fd = open(dirSpecBplist, 0);␊
+␉␉if (fd >= 0) goto success_fd;␊
+␉}␊
+␉␊
 success_fd:␊
 ␉␊
 ␉if (fd >= 0)␊

-96
97 97
98 98
99
99 100
100 101
101 102
+#define kEHCIhard␉␉␉"EHCIhard"␉␉␉// usb.c␊
#define kDefaultPartition␉"Default Partition"␉// sys.c␊
#define kMD0Image␉␉␉"md0"␉␉␉␉// ramdisk.h␊
#define kTestConfigKey␉␉"config"␉␉␉// stringTable.c␊
#define kCanOverrideKey␉␉"CanOverride"␉␉// stringTable.c␊
␊
/*␊
 #define kEHCIhard␉␉␉"EHCIhard"␉␉␉// usb.c␊
 #define kDefaultPartition␉"Default Partition"␉// sys.c␊
 #define kMD0Image␉␉␉"md0"␉␉␉␉// ramdisk.h␊
+#define kTestConfigKey␉␉"config"␉␉␉// stringTable.c␊
 #define kCanOverrideKey␉␉"CanOverride"␉␉// stringTable.c␊
 ␊
 /*␊

-1169
1170 1170
1171 1171
1172 
1172
1173
1173 1174
1174 
1175 1175
1176 1176
1177 1177
... ...
1179 1179
1180 1180
1181 1181
1182 
1182
1183 1183
1184 1184
1185 1185
+    // trying to load the config file anyway.␊
    else␊
      return -1;␊
␊
␉␊
␉//Azi: implemented at loadOverrideConfig.␊
    // Load config table specified by the user, or use the default.␊
␉//Azi: not working.␊
    //if (!getValueForBootKey(cp, "config", &val, &cnt)) {␊
    //  val = 0;␊
    //  cnt = 0;␊

␊
    // Load com.apple.Boot.plist from the selected volume␊
    // and use its contents to override default bootConfig.␊
    // This is not a mandatory opeartion anymore.␊
    // This is not a mandatory operation anymore.␊
␊
    loadOverrideConfig(&bootInfo->overrideConfig);␊
␊
 ...
     // trying to load the config file anyway.␊
     else␊
       return -1;␊
-␊
+␉␊
+␉//Azi: implemented at loadOverrideConfig.␊
     // Load config table specified by the user, or use the default.␊
-␉//Azi: not working.␊
     //if (!getValueForBootKey(cp, "config", &val, &cnt)) {␊
     //  val = 0;␊
     //  cnt = 0;␊
 ␊
     // Load com.apple.Boot.plist from the selected volume␊
     // and use its contents to override default bootConfig.␊
-    // This is not a mandatory opeartion anymore.␊
+    // This is not a mandatory operation anymore.␊
 ␊
     loadOverrideConfig(&bootInfo->overrideConfig);␊
 ␊