wok-6.x view ocsinventory-agent/stuff/ocsinventory-agent-1.1.2.1.u @ rev 22407

Add knot-dns (again)
author Pascal Bellard <pascal.bellard@slitaz.org>
date Tue Dec 10 16:56:23 2019 +0100 (2019-12-10)
parents
children
line source
1 --- Ocsinventory-Agent-1.1.2.1-ori/MANIFEST
2 +++ Ocsinventory-Agent-1.1.2.1/MANIFEST
3 @@ -75,6 +75,7 @@
4 lib/Ocsinventory/Agent/Backend/OS/Generic/Packaging/BSDpkg.pm
5 lib/Ocsinventory/Agent/Backend/OS/Generic/Packaging/ByHand.pm
6 lib/Ocsinventory/Agent/Backend/OS/Generic/Packaging/Deb.pm
7 +lib/Ocsinventory/Agent/Backend/OS/Generic/Packaging/Tazpkg.pm
8 lib/Ocsinventory/Agent/Backend/OS/Generic/Packaging/Gentoo.pm
9 lib/Ocsinventory/Agent/Backend/OS/Generic/Packaging/Pacman.pm
10 lib/Ocsinventory/Agent/Backend/OS/Generic/Packaging/RPM.pm
11 --- Ocsinventory-Agent-1.1.2.1-ori/lib/Ocsinventory/Agent/Backend/OS/Linux/Drives.pm
12 +++ Ocsinventory-Agent-1.1.2.1/lib/Ocsinventory/Agent/Backend/OS/Linux/Drives.pm
13 @@ -3,7 +3,7 @@
14 use strict;
15 sub check {
16 return unless can_run ("df");
17 - my $df = `df -TP`;
18 + my $df = `df -k`;
19 return 1 if $df =~ /\w+/;
20 0
21 }
22 @@ -58,7 +58,7 @@
23 }
24 }
25
26 - foreach(`df -TP`) { # TODO retrive error
27 + foreach(`df -k`) { # TODO retrive error
28 my $createdate;
29 my $free;
30 my $filesystem;
31 @@ -68,12 +68,12 @@
32 my $volumn;
33 my $serial;
34
35 - if(/^(\S+)\s+(\S+)\s+(\S+)\s+(?:\S+)\s+(\S+)\s+(?:\S+)\s+(\S+)\n/){
36 - $free = sprintf("%i",($4/1024));
37 - $filesystem = $2;
38 - $total = sprintf("%i",($3/1024));
39 - $type = $5;
40 - $volumn = $1;
41 + if(/^(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\n/){
42 + $free = sprintf("%i",($4/1024));
43 + $filesystem = $1;
44 + $total = sprintf("%i",($2/1024));
45 + $type = `grep ^$1 /etc/mtab | cut -d " " -f 3`;;
46 + $volumn = $6;
47
48 # no virtual FS
49 next if ($filesystem =~ /^(tmpfs|usbfs|proc|devpts|devshm|udev)$/);