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

Date:

2015-09-11 03:24:40 (8 years 7 months ago)

Author:

ErmaC

Commit:

2759

Parents:

2758

Message:

Improving Operating System Identification.

Changes:

M	/branches/ErmaC/Enoch/i386/boot2/options.c
M	/branches/ErmaC/Enoch/i386/libsaio/saio_types.h
M	/branches/ErmaC/Enoch/i386/libsaio/disk.c

File differences

-1800
1801 1801
1802 1802
1803
1803 1804
1804 1805
1806
1807
1808
1809
1805 1810
1806 1811
1807 1812
+␉␉const char *val;␊
␉␉int len;␊
␊
␉␉// ProductVersion␊
␉␉if  (getValueForKey(kProductVersion, &val, &len, &systemVersion))␊
␉␉{␊
␉␉␉// Copy the complete value into OSFullVer␊
␉␉␉strncpy( bvr->OSFullVer, val, len );␊
␉␉␉bvr->OSFullVer[len] = '\0';   /* null character manually added */␊
␊
␉␉␉// getValueForKey uses const char for val␊
␉␉␉// so copy it and trim␊
␉␉␉*str = '\0';␊
 ␉␉const char *val;␊
 ␉␉int len;␊
 ␊
+␉␉// ProductVersion␊
 ␉␉if  (getValueForKey(kProductVersion, &val, &len, &systemVersion))␊
 ␉␉{␊
+␉␉␉// Copy the complete value into OSFullVer␊
+␉␉␉strncpy( bvr->OSFullVer, val, len );␊
+␉␉␉bvr->OSFullVer[len] = '\0';   /* null character manually added */␊
+␊
 ␉␉␉// getValueForKey uses const char for val␊
 ␉␉␉// so copy it and trim␊
 ␉␉␉*str = '\0';␊

-211
212 212
213 213
214
214 215
215 216
216 217
+␉bool␉␉␉filtered;␉␉/* newFilteredBVChain() will set to TRUE */␊
␉bool␉␉␉visible;␉␉/* will shown in the device list */␊
␉char␉␉␉OSVersion[OSVERSTRLEN]; /* Null terminated string from '/System/Library/CoreServices/SystemVersion.plist/ProductVersion' e.g. "10.10.10" - hope will not reach e.g. 111.222.333 soon:) If so, OSVERSTRLEN 9 change to 12 */␊
␉char␉␉␉OSFullVer[OSVERSTRLEN]; /* Null terminated string from '/System/Library/CoreServices/SystemVersion.plist/ProductVersion' */␊
␉bool␉␉␉OSisServer;␉␉/* 1 = OS X server , 0 = OS X client */␊
␉bool␉␉␉OSisInstaller;␉␉/* 1 = OS X Install partition / recovery partition , 0 = OS X Install */␊
␊
 ␉bool␉␉␉filtered;␉␉/* newFilteredBVChain() will set to TRUE */␊
 ␉bool␉␉␉visible;␉␉/* will shown in the device list */␊
 ␉char␉␉␉OSVersion[OSVERSTRLEN]; /* Null terminated string from '/System/Library/CoreServices/SystemVersion.plist/ProductVersion' e.g. "10.10.10" - hope will not reach e.g. 111.222.333 soon:) If so, OSVERSTRLEN 9 change to 12 */␊
+␉char␉␉␉OSFullVer[OSVERSTRLEN]; /* Null terminated string from '/System/Library/CoreServices/SystemVersion.plist/ProductVersion' */␊
 ␉bool␉␉␉OSisServer;␉␉/* 1 = OS X server , 0 = OS X client */␊
 ␉bool␉␉␉OSisInstaller;␉␉/* 1 = OS X Install partition / recovery partition , 0 = OS X Install */␊
 ␊

-1314
1315 1315
1316 1316
1317 
1317
1318 1318
1319 1319
1320 1320
+␉}␊
␊
␉// Save a version of mac os we're booting.␊
␉MacOSVerCurrent = MacOSVer2Int(gBootVolume->OSVersion);␊
␉MacOSVerCurrent = MacOSVer2Int(gBootVolume->OSFullVer);␊
␉// so copy it and trim␊
␉gMacOSVersion[0] = 0;␊
␉if ( MacOSVerCurrent >= MacOSVer2Int("10.10") )␊
 ␉}␊
 ␊
 ␉// Save a version of mac os we're booting.␊
-␉MacOSVerCurrent = MacOSVer2Int(gBootVolume->OSVersion);␊
+␉MacOSVerCurrent = MacOSVer2Int(gBootVolume->OSFullVer);␊
 ␉// so copy it and trim␊
 ␉gMacOSVersion[0] = 0;␊
 ␉if ( MacOSVerCurrent >= MacOSVer2Int("10.10") )␊