Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes #4197: correct most size undetection by fusion inventory #482

Merged
merged 1 commit into from
Sep 18, 2014
Merged

Fixes #4197: correct most size undetection by fusion inventory #482

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions rudder-agent/SOURCES/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ localdepends: ./initial-promises ./detect_os.sh ./files ./fusioninventory-agent
$(PATCH) -d ./fusioninventory-agent-2.3.6 -p1 < ./patches/fusioninventory/2.3.6/0003-unix-ps-etime-usage.patch
$(PATCH) -d ./fusioninventory-agent-2.3.6 -p1 < ./patches/fusioninventory/2.3.6/0004-aix-microcode-version-retrieval.patch
$(PATCH) -d ./fusioninventory-agent-2.3.6 -p1 < ./patches/fusioninventory/2.3.6/0005-aix-duplicated-network-interfaces.patch
$(PATCH) -d ./fusioninventory-agent-2.3.6 -p1 < ./patches/fusioninventory/2.3.6/0006-correct-storage-size-detection.patch
# Fix a lsusb invocation that crashes some SLES machines
$(FIND) ./fusioninventory-agent-2.3.6 -iname "USB.pm" -exec rm "{}" \;

Expand Down
27 changes: 27 additions & 0 deletions rudder-agent/SOURCES/patches/fusioninventory/2.3.6/0006-correct-storage-size-detection.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
commit 846cdd36c94702999b907d8a33b6e8bc4c37b5a0
Author: Nicolas CHARLES <nicolas.charles@normation.com>
Date: Tue Sep 16 12:00:08 2014 +0200

Fixes #2718: correct condition for disk storage computation

diff --git a/lib/FusionInventory/Agent/Task/Inventory/Linux/Storages.pm b/lib/FusionInventory/Agent/Task/Inventory/Linux/Storages.pm
index 618749f..6341f00 100644
--- a/lib/FusionInventory/Agent/Task/Inventory/Linux/Storages.pm
+++ b/lib/FusionInventory/Agent/Task/Inventory/Linux/Storages.pm
@@ -7,6 +7,7 @@ use English qw(-no_match_vars);

use FusionInventory::Agent::Tools;
use FusionInventory::Agent::Tools::Linux;
+use FusionInventory::Agent::Tools::Unix;

sub isEnabled {
return 1;
@@ -93,7 +94,7 @@ sub doInventory {
);
}

- if ($device->{DISKSIZE} && $device->{TYPE} =~ /^cd/) {
+ if (!$device->{DISKSIZE} && $device->{TYPE} !~ /^cd/) {
$device->{DISKSIZE} = getDeviceCapacity(device => '/dev/' . $device->{NAME});
}