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

Date:

2012-03-17 03:24:42 (12 years 1 month ago)

Author:

Evan Lojewski

Commit:

1893

Parents:

1892

Message:

Don't use the kernel cache if safe mode or -f is specified

Changes:

M	/trunk/i386/boot2/boot.c

File differences

-228
229 229
230 230
231
232
233
234
235
236
231 237
232 238
233 239
+␉long␉␉flags, time, cachetime, kerneltime, exttime, ret=-1;␊
    unsigned long adler32;␊
␊
    if((gBootMode & kBootModeSafe) == 0)␊
    {␊
␉␉verbose("Kernel Cache ignored\n", kernelCacheFile);␊
␉␉return -1;␊
    }␊
␊
␉// Use specify kernel cache file if not empty␊
␉if (cacheFile[0] != 0)␊
␉␉strlcpy(kernelCacheFile, cacheFile, sizeof(kernelCacheFile));␊
 ␉long␉␉flags, time, cachetime, kerneltime, exttime, ret=-1;␊
     unsigned long adler32;␊
 ␊
+    if((gBootMode & kBootModeSafe) == 0)␊
+    {␊
+␉␉verbose("Kernel Cache ignored\n", kernelCacheFile);␊
+␉␉return -1;␊
+    }␊
+␊
 ␉// Use specify kernel cache file if not empty␊
 ␉if (cacheFile[0] != 0)␊
 ␉␉strlcpy(kernelCacheFile, cacheFile, sizeof(kernelCacheFile));␊