pass filesystem type explicitely when it can not get computed from df…

… output (fix #1394)
fusioninventory · Dec 18, 2011 · 17308ff · 17308ff
1 parent 47feefb
commit 17308ff
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/lib/FusionInventory/Agent/Task/Inventory/Input/BSD/Drives.pm b/lib/FusionInventory/Agent/Task/Inventory/Input/BSD/Drives.pm
@@ -25,8 +25,9 @@ sub doInventory {
     my @filesystems;
     foreach my $type (@types) {
         push @filesystems, getFilesystemsFromDf(
-            logger => $logger,
-            command => "df -P -k -t $type"
+            logger  => $logger,
+            command => "df -P -k -t $type",
+            type    => $type
         );
     }
 

diff --git a/lib/FusionInventory/Agent/Task/Inventory/Input/MacOS/Drives.pm b/lib/FusionInventory/Agent/Task/Inventory/Input/MacOS/Drives.pm
@@ -25,8 +25,9 @@ sub doInventory {
     my @filesystems;
     foreach my $type (@types) {
         push @filesystems, getFilesystemsFromDf(
-            logger => $logger,
-            command => "df -P -k -t $type"
+            logger  => $logger,
+            command => "df -P -k -t $type",
+            type    => $type,
         );
     }
 

diff --git a/lib/FusionInventory/Agent/Tools/Unix.pm b/lib/FusionInventory/Agent/Tools/Unix.pm
@@ -146,7 +146,8 @@ sub _parseDhcpLeaseFile {
 }
 
 sub getFilesystemsFromDf {
-    my $handle = getFileHandle(@_);
+    my %params = (@_);
+    my $handle = getFileHandle(%params);
 
     my @filesystems;
 
@@ -161,14 +162,17 @@ sub getFilesystemsFromDf {
         chomp $line;
         my @infos = split(/\s+/, $line);
 
-        # depending of the number of colums, information index change
+        # depending on the df implementation, and how it is called 
+        # the filesystem type may appear as second colum, or be missing
+        # in the second case, it has to be given by caller
         my ($filesystem, $total, $free, $type);
         if ($headers[1] eq 'Type') {
             $filesystem = $infos[1];
             $total      = $infos[2];
             $free       = $infos[4];
             $type       = $infos[6];
         } else {
+            $filesystem = $params{type},
             $total = $infos[1];
             $free  = $infos[3];
             $type  = $infos[5];