From f5b467c4fbb9b5dcc241f9e361713e8fb4024d52 Mon Sep 17 00:00:00 2001 From: Jazzzny Date: Sat, 26 Aug 2023 18:59:50 -0400 Subject: [PATCH 1/2] Fix Rosetta detection --- resources/device_probe.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/resources/device_probe.py b/resources/device_probe.py index 1c129eae0..c6d00f0f9 100644 --- a/resources/device_probe.py +++ b/resources/device_probe.py @@ -943,8 +943,9 @@ class Computer: self.oclp_sys_signed = sys_plist["Custom Signature"] def check_rosetta(self): - result = subprocess.run("sysctl -in sysctl.proc_translated".split(), stdout=subprocess.PIPE).stdout.decode() - if result: + arch = subprocess.run("uname -m".split(), stdout=subprocess.PIPE).stdout.decode() + kernel_ver = subprocess.run("sysctl kern.version".split(), stdout=subprocess.PIPE).stdout.decode() + if "arm64" not in arch and "ARM64" in kernel_ver: self.rosetta_active = True else: self.rosetta_active = False \ No newline at end of file From 91417bf75da96a54f359d767865e7365d1db9a8b Mon Sep 17 00:00:00 2001 From: Jazzzny Date: Sat, 26 Aug 2023 19:06:27 -0400 Subject: [PATCH 2/2] better fix --- resources/device_probe.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/resources/device_probe.py b/resources/device_probe.py index c6d00f0f9..49c37e24d 100644 --- a/resources/device_probe.py +++ b/resources/device_probe.py @@ -943,9 +943,8 @@ class Computer: self.oclp_sys_signed = sys_plist["Custom Signature"] def check_rosetta(self): - arch = subprocess.run("uname -m".split(), stdout=subprocess.PIPE).stdout.decode() - kernel_ver = subprocess.run("sysctl kern.version".split(), stdout=subprocess.PIPE).stdout.decode() - if "arm64" not in arch and "ARM64" in kernel_ver: + result = subprocess.run("sysctl -in sysctl.proc_translated".split(), stdout=subprocess.PIPE).stdout.decode() + if "1" in result: self.rosetta_active = True else: self.rosetta_active = False \ No newline at end of file