Chameleon

Chameleon Commit Details

Date:2010-07-26 15:25:17 (13 years 9 months ago)
Author:Evan Lojewski
Commit:262
Parents: 261
Message:Added check for rd before trying to access it
Changes:
M/trunk/i386/boot2/ramdisk.c

File differences

trunk/i386/boot2/ramdisk.c
3535
3636
3737
38
39
38
4039
40
41
42
43
44
45
4146
4247
4348
......
4954
5055
5156
52
53
57
58
59
60
61
62
5463
5564
5665
␉␉␊
␉␉if(fh < 0)␊
␉␉{␊
␉␉␉sprintf(filename, "rd(0,0)/Extra/%s", override_filename);␊
␉␉␉if((fh = open(filename, 0)) < 0)␊
␉␉␉if(gRAMDiskVolume && !gRAMDiskBTAliased)␊
␉␉␉{␊
␉␉␉␉sprintf(filename, "rd(0,0)/Extra/%s", override_filename);␊
␉␉␉␉fh = open(filename, 0);␊
␉␉␉}␊
␉␉␉␊
␉␉␉if(fh < 0)␊
␉␉␉{␊
␉␉␉␉sprintf(filename, "/Extra/%s", override_filename);␊
␉␉␉␉fh = open(filename, 0);␊
␉␉␉␉␊
␉if(fh < 0)␊
␉{␊
␉␉// Fallback to Postboot.img␊
␉␉sprintf(filename, "rd(0,0)/Extra/Postboot.img");␊
␉␉fh = open(filename, 0);␊
␉␉if(gRAMDiskVolume && !gRAMDiskBTAliased)␊
␉␉{␊
␉␉␉sprintf(filename, "rd(0,0)/Extra/Postboot.img");␊
␉␉␉fh = open(filename, 0);␊
␉␉}␊
␉␉␊
␉␉if(fh < 0)␊
␉␉{␊
␉␉␉sprintf(filename, "/Extra/Postboot.img");␉// Check /Extra if not in rd(0,0)␊

Archive Download the corresponding diff file

Revision: 262