From 45396cc2d8dcb61190caa1d8b7969468dee0ac71 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Thu, 21 Jul 2016 21:44:31 +0200
Subject: [PATCH] src: favour uname -p for platform

---
 src/etc/inc/services.inc               | 2 +-
 src/etc/rc.initial.banner              | 2 +-
 src/www/crash_reporter.php             | 2 +-
 src/www/widgets/api/plugins/system.inc | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/etc/inc/services.inc b/src/etc/inc/services.inc
index 0a78b6404..e063f87c6 100644
--- a/src/etc/inc/services.inc
+++ b/src/etc/inc/services.inc
@@ -2059,7 +2059,7 @@ EOD;
         $platform = $g['product_name'];
         $sysDescr = "{$g['product_name']} " . php_uname("n") .
                     " {$version} {$platform} " . php_uname("s") .
-                    " " . php_uname("r") . " " . php_uname("m");
+                    " " . php_uname("r") . " " . php_uname("p");
 
         $snmpdconf .= <<<EOD
 system := 1
diff --git a/src/etc/rc.initial.banner b/src/etc/rc.initial.banner
index d5c428b0c..c64b93b7c 100755
--- a/src/etc/rc.initial.banner
+++ b/src/etc/rc.initial.banner
@@ -35,7 +35,7 @@ require_once("util.inc");
 $version = strtok(file_get_contents('/usr/local/opnsense/version/opnsense'), '-');
 $flavour = strtok(shell_exec('/usr/local/bin/openssl version'), ' ');
 $hostname = $config['system']['hostname'];
-$machine = trim(shell_exec('uname -m'));
+$machine = trim(shell_exec('uname -p'));
 $domain = $config['system']['domain'];
 $product = $g['product_name'];
 
diff --git a/src/www/crash_reporter.php b/src/www/crash_reporter.php
index 628601640..c46335470 100644
--- a/src/www/crash_reporter.php
+++ b/src/www/crash_reporter.php
@@ -69,7 +69,7 @@ $crash_report_header = sprintf(
     trim(file_get_contents('/usr/local/opnsense/version/opnsense')),
     file_exists($last_version) ? sprintf(' [%s]', trim(file_get_contents($last_version))) : '',
     trim(shell_exec('/usr/local/bin/openssl version')),
-    php_uname('m'),
+    php_uname('p'),
     shell_exec('/sbin/sysctl -b kern.hostuuid'),
     date('r')
 );
diff --git a/src/www/widgets/api/plugins/system.inc b/src/www/widgets/api/plugins/system.inc
index a16650f22..3854f053b 100644
--- a/src/www/widgets/api/plugins/system.inc
+++ b/src/www/widgets/api/plugins/system.inc
@@ -141,7 +141,7 @@ function system_api_versions()
 
     $result = array();
 
-    $result[] = sprintf('%s %s-%s', $g['product_name'], explode('-', trim(file_get_contents('/usr/local/opnsense/version/opnsense')))[0], php_uname('m'));
+    $result[] = sprintf('%s %s-%s', $g['product_name'], explode('-', trim(file_get_contents('/usr/local/opnsense/version/opnsense')))[0], php_uname('p'));
     $result[] = php_uname('s') . ' ' . php_uname('r');
     $result[] = exec('/usr/local/bin/openssl version');