fastfetch-cli/fastfetch
1
0
Fork 0
mirror of https://github.com/fastfetch-cli/fastfetch.git synced 2026-09-13 02:42:09 +02:00
Code Issues Packages Projects Releases 10 Wiki Activity

Bootmgr (macOS): don't hard-code the firmware name

Browse Source
This commit is contained in:
Carter Li
2026-06-03 09:45:52 +08:00
parent 4eae8ac244
commit 5e1e94473e
2 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/detection/bios/bios_apple.c
+4 -3
View File
@@ -38,9 +38,10 @@ const char* ffDetectBios(FFBiosResult* bios) {
FF_IOOBJECT_AUTO_RELEASE io_registry_entry_t deviceChosen = IORegistryEntryFromPath(MACH_PORT_NULL, "IODeviceTree:/chosen");
if (deviceChosen) {
FF_CFTYPE_AUTO_RELEASE CFStringRef systemFirmwareVersion = IORegistryEntryCreateCFProperty(deviceChosen, CFSTR("system-firmware-version"), kCFAllocatorDefault, kNilOptions);
if (systemFirmwareVersion) {
ffCfStrGetString(systemFirmwareVersion, &bios->version);
FF_CFTYPE_AUTO_RELEASE CFStringRef tag = IORegistryEntryCreateCFProperty(deviceChosen, CFSTR("iboot-stage-one-tag"), kCFAllocatorDefault, kNilOptions)
?: IORegistryEntryCreateCFProperty(deviceChosen, CFSTR("system-firmware-version"), kCFAllocatorDefault, kNilOptions);
if (tag) {
ffCfStrGetString(tag, &bios->version);
uint32_t index = ffStrbufFirstIndexC(&bios->version, '-');
if (index != bios->version.length) {
ffStrbufAppendNS(&bios->type, index, bios->version.chars);
src/detection/bootmgr/bootmgr_apple.c
+16 -2
View File
@@ -11,7 +11,7 @@ static const char* detectSecureBoot(bool* result) {
return "IORegistryEntryFromPath() failed";
}
FF_CFTYPE_AUTO_RELEASE CFTypeRef prop = IORegistryEntryCreateCFProperty(entryDevice, CFSTR("secure-boot"), kCFAllocatorDefault, 0);
FF_CFTYPE_AUTO_RELEASE CFTypeRef prop = IORegistryEntryCreateCFProperty(entryDevice, CFSTR("secure-boot"), kCFAllocatorDefault, kNilOptions);
if (!prop) {
return "IORegistryEntryCreateCFProperty() failed";
}
@@ -47,7 +47,21 @@ const char* ffDetectBootmgr(FFBootmgrResult* result) {
ffStrbufSetStatic(&result->firmware, "/System/Library/CoreServices/boot.efi");
}
ffStrbufSetStatic(&result->name, "iBoot");
#ifdef __aarch64__
FF_IOOBJECT_AUTO_RELEASE io_registry_entry_t deviceChosen = IORegistryEntryFromPath(MACH_PORT_NULL, "IODeviceTree:/chosen");
if (deviceChosen) {
FF_CFTYPE_AUTO_RELEASE CFStringRef tag = IORegistryEntryCreateCFProperty(deviceChosen, CFSTR("iboot-stage-two-tag"), kCFAllocatorDefault, kNilOptions)
?: IORegistryEntryCreateCFProperty(deviceChosen, CFSTR("system-firmware-version"), kCFAllocatorDefault, kNilOptions);
if (tag) {
ffCfStrGetString(tag, &result->name);
ffStrbufSubstrBeforeFirstC(&result->name, '-');
}
}
#endif
if (!result->name.length) {
ffStrbufSetStatic(&result->name, "iBoot");
}
detectSecureBoot(&result->secureBoot);