timamsk/OpenCore-Legacy-Patcher
1
0
Fork 0
mirror of https://github.com/dortania/OpenCore-Legacy-Patcher.git synced 2026-04-23 11:30:15 +10:00
Code Issues Packages Projects Releases Wiki Activity

sys_patch_dict.py: ensure get_nvram() decodes when str expected

Browse Source
This commit is contained in:
Mykola Grymalyuk
2022-05-29 11:09:48 -06:00
parent 467cc78f58
commit e8f2f7fd78
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
resources/sys_patch_detect.py
View File

@@ -123,7 +123,7 @@ class detect_root_patch:
def detect_demux(self): def detect_demux(self):
# If GFX0 is missing, assume machine was demuxed # If GFX0 is missing, assume machine was demuxed
# -wegnoegpu would also trigger this, so ensure arg is not present # -wegnoegpu would also trigger this, so ensure arg is not present
if not "-wegnoegpu" in (utilities.get_nvram("boot-args") or ""): if not "-wegnoegpu" in (utilities.get_nvram("boot-args", decode=True) or ""):
igpu = self.constants.computer.igpu igpu = self.constants.computer.igpu
dgpu = self.check_dgpu_status() dgpu = self.check_dgpu_status()
if igpu and not dgpu: if igpu and not dgpu:
@@ -139,7 +139,7 @@ class detect_root_patch:
def check_nv_web_nvram(self): def check_nv_web_nvram(self):
# First check boot-args, then dedicated nvram variable # First check boot-args, then dedicated nvram variable
nv_on = utilities.get_nvram("boot-args") nv_on = utilities.get_nvram("boot-args", decode=True)
if nv_on: if nv_on:
if "nvda_drv_vrl=" in nv_on: if "nvda_drv_vrl=" in nv_on:
return True return True
@@ -150,7 +150,7 @@ class detect_root_patch:
def check_nv_web_opengl(self): def check_nv_web_opengl(self):
# First check boot-args, then whether property exists on GPU # First check boot-args, then whether property exists on GPU
nv_on = utilities.get_nvram("boot-args") nv_on = utilities.get_nvram("boot-args", decode=True)
if nv_on: if nv_on:
if "ngfxgl=" in nv_on: if "ngfxgl=" in nv_on:
return True return True
@@ -162,7 +162,7 @@ class detect_root_patch:
def check_nv_compat(self): def check_nv_compat(self):
# Check for 'nv_web' in boot-args, then whether property exists on GPU # Check for 'nv_web' in boot-args, then whether property exists on GPU
nv_on = utilities.get_nvram("boot-args") nv_on = utilities.get_nvram("boot-args", decode=True)
if nv_on: if nv_on:
if "ngfxcompat=" in nv_on: if "ngfxcompat=" in nv_on:
return True return True

11
resources/utilities.py
View File

@@ -157,7 +157,7 @@ def amfi_status():
if oclp_guid: if oclp_guid:
if "-allow_amfi" in oclp_guid: if "-allow_amfi" in oclp_guid:
return False return False
boot_args = get_nvram("boot-args", decode=False) boot_args = get_nvram("boot-args", decode=True)
if boot_args: if boot_args:
for arg in amfi_args: for arg in amfi_args:
if arg in boot_args: if arg in boot_args:
@@ -215,10 +215,11 @@ def check_metal_support(device_probe, computer):
def check_filevault_skip(): def check_filevault_skip():
# Check whether we can skip FileVault check with Root Patching # Check whether we can skip FileVault check with Root Patching
if get_nvram("OCLP-Settings", "4D1FDA02-38C7-4A6A-9CC6-4BCCA8B30102", decode=False) and "-allow_fv" in get_nvram("OCLP-Settings", "4D1FDA02-38C7-4A6A-9CC6-4BCCA8B30102", decode=True): nvram = get_nvram("OCLP-Settings", "4D1FDA02-38C7-4A6A-9CC6-4BCCA8B30102", decode=True)
return True if nvram:
else: if "-allow_fv" in nvram:
return False return True
return False
def check_secure_boot_model(): def check_secure_boot_model():