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

Date:

2010-02-20 12:13:38 (14 years 2 months ago)

Author:

JrCs

Commit:

Parents:

Message:

Show useful informations in case of errors

Changes:

M	/branches/JrCs/i386/boot2/boot.c
M	/branches/JrCs/i386/libsaio/fake_efi.c

File differences

-334
335 335
336 336
337 
338 337
339 338
340 339
... ...
346 345
347 346
348 347
349 
350 348
351 349
352 350
... ...
361 359
362 360
363 361
364 
362
365 363
366 364
367 365
368 366
369 
370 
371 367
372 368
373 369
+ */␊
static uuid_t* getSystemID()␊
{␊
    bool        pause = FALSE;␊
    int         len;␊
    const char* StrSystemId = NULL;␊
    uuid_t*     SystemId    = NULL;␊

        SystemId = newUUIDFromString(StrSystemId);␊
        if (SystemId == NULL) {␊
            error("Error: invalid SystemID '%s'\n", StrSystemId);␊
            pause = TRUE;␊
        }␊
    }␊
␊

        // if(!ret)   // no bios dmi UUID available, set a fixed value for system-id␊
        SystemId = (uuid_t*) &SYSTEM_ID;␊
        getStringFromUUID(*SystemId, UUIDstr);␊
        error("Using a fixed SystemID: '%s'\n", UUIDstr);␊
        warning("Using a fixed SystemID: '%s'\n", UUIDstr);␊
        //␊
        // verbose("Customizing SystemID with : %s\n", getStringFromUUID(ret)); // apply a nice formatting to the displayed output␊
    }␊
␊
    if (pause) getc();␊
␊
    return SystemId;␊
}␊
␊
 ...
 ...
  */␊
 static uuid_t* getSystemID()␊
 {␊
-    bool        pause = FALSE;␊
     int         len;␊
     const char* StrSystemId = NULL;␊
     uuid_t*     SystemId    = NULL;␊
         SystemId = newUUIDFromString(StrSystemId);␊
         if (SystemId == NULL) {␊
             error("Error: invalid SystemID '%s'\n", StrSystemId);␊
-            pause = TRUE;␊
         }␊
     }␊
 ␊
         // if(!ret)   // no bios dmi UUID available, set a fixed value for system-id␊
         SystemId = (uuid_t*) &SYSTEM_ID;␊
         getStringFromUUID(*SystemId, UUIDstr);␊
-        error("Using a fixed SystemID: '%s'\n", UUIDstr);␊
+        warning("Using a fixed SystemID: '%s'\n", UUIDstr);␊
         //␊
         // verbose("Customizing SystemID with : %s\n", getStringFromUUID(ret)); // apply a nice formatting to the displayed output␊
     }␊
 ␊
-    if (pause) getc();␊
-␊
     return SystemId;␊
 }␊
 ␊

-138
139 139
140 140
141 
142 
141
142
143
143 144
144 145
145 146
... ...
151 152
152 153
153 154
155
156
154 157
155 158
156 159
... ...
162 165
163 166
164 167
168
169
165 170
166 
167 
168 
171
172
173
174
175
169 176
170 177
171 
178
172 179
173 
174 
175 180
176 181
177 182
... ...
182 187
183 188
184 189
185 
186 
187 
190
188 191
189 192
190 193
+␊
static int ExecKernel(void *binary)␊
{␊
    entry_t                   kernelEntry;␊
    int                       ret;␊
    entry_t kernelEntry;␊
    int     ret;␊
    bool    waitBeforeBoot = FALSE;␊
␊
    bootArgs->kaddr = bootArgs->ksize = 0;␊
␊

    if ( ret != 0 )␊
        return ret;␊
␊
    getBoolForKey(kWaitForKeypressKey, &waitBeforeBoot, &bootInfo->bootConfig);␊
␊
    // Reserve space for boot args␊
    reserveKernBootStruct();␊
␊

␊
    clearActivityIndicator();␊
␊
    setupFakeEfi();␊
␊
    if (gErrors) {␊
        printf("Errors encountered while starting up the computer.\n");␊
        printf("Pausing %d seconds...\n", kBootErrorTimeout);␊
        sleep(kBootErrorTimeout);␊
        warning("Errors encountered while starting up the computer.\n");␊
        if (!waitBeforeBoot) {␊
            printf("Pausing %d seconds...\n", kBootErrorTimeout);␊
            sleep(kBootErrorTimeout);␊
        }␊
    }␊
␊
    setupFakeEfi();␊
    verbose("Starting Darwin %s arch:%s\n", gMacOSVersion, ( archCpuType == CPU_TYPE_I386 ) ? "x86" : "x86_64");␊
␊
    verbose("Starting Darwin %s\n",( archCpuType == CPU_TYPE_I386 ) ? "x86" : "x86_64");␊
␊
    // Cleanup the PXE base code.␊
␊
    if ( (gBootFileType == kNetworkDeviceType) && gUnloadPXEOnExit ) {␊

        }␊
    }␊
␊
␉bool dummyVal;␊
␊
    if (getBoolForKey(kWaitForKeypressKey, &dummyVal, &bootInfo->bootConfig) && dummyVal)␊
    if (waitBeforeBoot)␊
    {␊
      printf("Press any key to continue...");␊
      getc();␊
 ...
 ...
 ...
 ␊
 static int ExecKernel(void *binary)␊
 {␊
-    entry_t                   kernelEntry;␊
-    int                       ret;␊
+    entry_t kernelEntry;␊
+    int     ret;␊
+    bool    waitBeforeBoot = FALSE;␊
 ␊
     bootArgs->kaddr = bootArgs->ksize = 0;␊
 ␊
     if ( ret != 0 )␊
         return ret;␊
 ␊
+    getBoolForKey(kWaitForKeypressKey, &waitBeforeBoot, &bootInfo->bootConfig);␊
+␊
     // Reserve space for boot args␊
     reserveKernBootStruct();␊
 ␊
 ␊
     clearActivityIndicator();␊
 ␊
+    setupFakeEfi();␊
+␊
     if (gErrors) {␊
-        printf("Errors encountered while starting up the computer.\n");␊
-        printf("Pausing %d seconds...\n", kBootErrorTimeout);␊
-        sleep(kBootErrorTimeout);␊
+        warning("Errors encountered while starting up the computer.\n");␊
+        if (!waitBeforeBoot) {␊
+            printf("Pausing %d seconds...\n", kBootErrorTimeout);␊
+            sleep(kBootErrorTimeout);␊
+        }␊
     }␊
 ␊
-    setupFakeEfi();␊
+    verbose("Starting Darwin %s arch:%s\n", gMacOSVersion, ( archCpuType == CPU_TYPE_I386 ) ? "x86" : "x86_64");␊
 ␊
-    verbose("Starting Darwin %s\n",( archCpuType == CPU_TYPE_I386 ) ? "x86" : "x86_64");␊
-␊
     // Cleanup the PXE base code.␊
 ␊
     if ( (gBootFileType == kNetworkDeviceType) && gUnloadPXEOnExit ) {␊
         }␊
     }␊
 ␊
-␉bool dummyVal;␊
-␊
-    if (getBoolForKey(kWaitForKeypressKey, &dummyVal, &bootInfo->bootConfig) && dummyVal)␊
+    if (waitBeforeBoot)␊
     {␊
       printf("Press any key to continue...");␊
       getc();␊

Download the corresponding diff file