diff --git a/public/assets/client_installer/payload/usr/local/munkireport/munkilib/reportcommon.py b/public/assets/client_installer/payload/usr/local/munkireport/munkilib/reportcommon.py index 2df52df39..3c2bdefc2 100644 --- a/public/assets/client_installer/payload/usr/local/munkireport/munkilib/reportcommon.py +++ b/public/assets/client_installer/payload/usr/local/munkireport/munkilib/reportcommon.py @@ -228,6 +228,14 @@ def get_cpuinfo(): return output.decode("utf-8") +def get_cpuarch(): + try: + arch_output = subprocess.check_output(["/usr/bin/arch", "-arm64", "/usr/bin/uname", "-m"], stderr=subprocess.STDOUT) + except subprocess.CalledProcessError: + arch_output = subprocess.check_output(["/usr/bin/uname", "-m"]) + return arch_output.decode("utf-8").strip() + + def get_buildversion(): cmd = ["/usr/bin/sw_vers", "-buildVersion"] proc = subprocess.Popen( diff --git a/public/assets/client_installer/payload/usr/local/munkireport/munkireport-runner b/public/assets/client_installer/payload/usr/local/munkireport/munkireport-runner index 82e77fca6..ef99d6e54 100755 --- a/public/assets/client_installer/payload/usr/local/munkireport/munkireport-runner +++ b/public/assets/client_installer/payload/usr/local/munkireport/munkireport-runner @@ -28,7 +28,7 @@ def main(): hardware_info = reportcommon.get_hardware_info() hardware_info['computer_name'] = reportcommon.get_computername() hardware_info['cpu'] = reportcommon.get_cpuinfo() - hardware_info['cpu_arch'] = os.uname()[4] + hardware_info['cpu_arch'] = reportcommon.get_cpuarch() hardware_info['hostname'] = os.uname()[1] hardware_info['os_version'] = \ reportcommon.getOsVersion(only_major_minor=False)