fix: Nolog option for megacli util

Backport of fusioninventory/fusioninventory-agent#996
glpi-project · Feb 21, 2022 · 8619b50 · 8619b50
1 parent 76a4eb9
commit 8619b50
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/Changes b/Changes
@@ -8,6 +8,7 @@ core:
 inventory:
 * Use uts.name for Proxmox lxc containers
 * Support customized AnyDesk client as remote management inventory on unix/linux
+* Backport of @xo4yecTb patch: NoLog option for megacli util fusioninventory/fusioninventory-agent#996
 
 collect:
 * Make collect task more verbose when debug is enabled

diff --git a/lib/GLPI/Agent/Task/Inventory/Linux/Storages/Megacli.pm b/lib/GLPI/Agent/Task/Inventory/Linux/Storages/Megacli.pm
@@ -118,7 +118,7 @@ sub _getStorages {
 sub _getAdpEnclosure {
     my (%params) = @_;
 
-    my $command = exists $params{adp} ? "megacli -EncInfo -a$params{adp}" : undef;
+    my $command = exists $params{adp} ? "megacli -EncInfo -a$params{adp} -NoLog" : undef;
 
     my $handle = getFileHandle(
         command => $command,
@@ -147,7 +147,7 @@ sub _getAdpEnclosure {
 sub _getSummary {
     my (%params) = @_;
 
-    my $command = exists $params{adp} ? "megacli -ShowSummary -a$params{adp}" : undef;
+    my $command = exists $params{adp} ? "megacli -ShowSummary -a$params{adp} -NoLog" : undef;
 
     my $handle = getFileHandle(
         command => $command,
@@ -198,7 +198,7 @@ sub _getSummary {
 sub _getPDlist {
     my (%params) = @_;
 
-    my $command = exists $params{adp} ? "megacli -PDlist -a$params{adp}" : undef;
+    my $command = exists $params{adp} ? "megacli -PDlist -a$params{adp} -NoLog" : undef;
 
     my $handle = getFileHandle(
         command => $command,

diff --git a/lib/GLPI/Agent/Task/Inventory/Linux/Storages/MegacliWithSmartctl.pm b/lib/GLPI/Agent/Task/Inventory/Linux/Storages/MegacliWithSmartctl.pm
@@ -60,7 +60,7 @@ sub doInventory {
 sub _getPDlist {
     my (%params) = @_;
 
-    $params{command} = defined $params{adp} ? "megacli -pdlist -a$params{adp}" : undef;
+    $params{command} = defined $params{adp} ? "megacli -pdlist -a$params{adp} -NoLog" : undef;
 
     my %pdlist;
     my $src = {};
@@ -87,7 +87,7 @@ sub _getPDlist {
 sub _getLDinfo {
     my (%params) = @_;
 
-    $params{command} = defined $params{adp} ? "megacli -ldinfo -lAll -a$params{adp}" : undef;
+    $params{command} = defined $params{adp} ? "megacli -ldinfo -lAll -a$params{adp} -NoLog" : undef;
 
     my %ldinfo;
     my $n = -1;
@@ -109,7 +109,7 @@ sub _getLDinfo {
 sub _getAdpPciInfo {
     my (%params) = @_;
 
-    $params{command} = defined $params{adp} ? "megacli -AdpGetPciInfo -a$params{adp}" : undef;
+    $params{command} = defined $params{adp} ? "megacli -AdpGetPciInfo -a$params{adp} -NoLog" : undef;
 
     my %adpinfo;
     foreach my $line (getAllLines(%params)) {