[Fusioninventory-commit] [fusinv/fusioninventory-agent] 3735ae: fix: Solaris 8 / 9 / 10 SWAP Bug

[Gonéri Le Bouder]

  Branch: refs/heads/2.2.x
  Home:   https://github.com/fusinv/fusioninventory-agent
  Commit: 3735ae16c336980facd89b1216d1651946df3db2
      https://github.com/fusinv/fusioninventory-agent/commit/3735ae16c336980facd89b1216d1651946df3db2
  Author: Marcel Werner <marcel.werner at bt.com>
  Date:   2012-04-13 (Fri, 13 Apr 2012)

  Changed paths:
    M lib/FusionInventory/Agent/Task/Inventory/Input/Solaris/Memory.pm

  Log Message:
  -----------
  fix: Solaris 8 / 9 / 10   SWAP Bug

With the version fusion-inventory-agent 2.2.0-2/3
we have problems with the <SWAP> entry.

The SWAP - Entry in the ocs file is filled with :
<SWAP>free</SWAP>

but should be a number.

like <SWAP>203720256</SWAP>

the problem is located in :

perl/agent/FusionInventory/Agent/Task/Inventory/Input/Solaris/Memory.pm

my $swapSize = getFirstMatch(
    command => 'swap -l',
    logger  => $logger,
    pattern => qr/\s+(\S+)$/
    );

It should be look like :

my $swapSize = getFirstMatch(
    command => 'swap -l',
    logger  => $logger,
    pattern => qr/\s+(\d+)$/
    );

A other problem "free" is not the complete swap space on Solaris.
swap -l
swapfile             dev  swaplo blocks   free
/dev/md/dsk/d1      85,1      16 8568176 8568176

better way you do it with:

swap -s
total: 365600k bytes allocated + 14992k reserved = 380592k used, 4472248k available

rg
marcel

closes: #1577


  Commit: 33effcd4426f6301bd672bf266c981dd93b99efc
      https://github.com/fusinv/fusioninventory-agent/commit/33effcd4426f6301bd672bf266c981dd93b99efc
  Author: Gonéri Le Bouder <goneri at rulezlan.org>
  Date:   2012-04-13 (Fri, 13 Apr 2012)

  Changed paths:
    M lib/FusionInventory/Agent/Task/Inventory/Input/Virtualization/Xen.pm

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/2.2.x' into 2.2.x


Compare: https://github.com/fusinv/fusioninventory-agent/compare/9c47555...33effcd