fix: arch detection under MacOS

Closes fusioninventory#473
po1vo · Sep 27, 2018 · ada9b11 · ada9b11
1 parent dfcb645
commit ada9b11
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/Changes b/Changes
@@ -18,6 +18,7 @@ inventory:
 * Enhanced software inventory under Arch Linux
 * Fix #453: under MacOS, skip XML DTD validation for software inventory as
   parsing may fail if a proxy is enabled
+* Fix #473: fix arch detection under MacOS
 
 deploy:
 * Bump Deploy task version to 2.7

diff --git a/lib/FusionInventory/Agent/Task/Inventory/MacOS.pm b/lib/FusionInventory/Agent/Task/Inventory/MacOS.pm
@@ -10,6 +10,8 @@ use English qw(-no_match_vars);
 use FusionInventory::Agent::Tools;
 use FusionInventory::Agent::Tools::MacOS;
 
+our $runAfter = ["FusionInventory::Agent::Task::Inventory::Generic"];
+
 sub isEnabled {
     return $OSNAME eq 'darwin';
 }
@@ -23,6 +25,7 @@ sub doInventory {
     # basic operating system informations
     my $kernelVersion = getFirstLine(command => 'uname -v');
     my $kernelRelease = getFirstLine(command => 'uname -r');
+    my $kernelArch    = getFirstLine(command => 'uname -m');
 
     my ($name, $version);
     my $infos = getSystemProfilerInfos(type => 'SPSoftwareDataType', logger => $logger);
@@ -48,6 +51,7 @@ sub doInventory {
         FULL_NAME      => $name,
         VERSION        => $version,
         KERNEL_VERSION => $kernelRelease,
+        ARCH           => $kernelArch,
         BOOT_TIME      => getFormatedLocalTime($boottime)
     });
 }