fix mrtg to not use /var/* tree in debian/ubuntu

diff --git a/Changes b/Changes
index a5a35d08a7d0b44a0293f2cbbc524e68ef38b227..69dde9cfee5f922b9ee50cd5deafdc909e232a8f 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,3 +1,7 @@
+25Sep07=======================================================================
+1. Fix mrtg command so that it does not require /var/lock (which anyway gets
+removed and recreated on boot - and the debianised mrtg does not recognise
+that) nor /var/lib/mrtg for the confcache (whatever that is).
 24Sep07=======================================================================
 1. fix error message on disconnect and, BTW, fix the cause of premature
 disconnections in the new PC92 code.

diff --git a/perl/Mrtg.pm b/perl/Mrtg.pm
index c6752e903710b7a61525827c8f8bc1346aebfde9..3871a9080cd7dfde330bbe8ac5f5dab0cd37636e 100644 (file)
--- a/perl/Mrtg.pm
+++ b/perl/Mrtg.pm
@@ -47,7 +47,7 @@ sub run
 {
        my $self = shift;
        $self->{mc}->close;
-       return `mrtg $self->{cfg}`;
+       return `mrtg --lock-file=$self->{dir}/mrtg.lock --confcache-file=$self->{dir}/mrtg.confcache $self->{cfg}`;
 }
 
 sub data

diff --git a/perl/Version.pm b/perl/Version.pm
index d6880a32da3165708928205322692a576d96f21c..60deaa75881ba30477f7be7a1d26bafac2521224 100644 (file)
--- a/perl/Version.pm
+++ b/perl/Version.pm
@@ -11,6 +11,6 @@ use vars qw($version $subversion $build);
 
 $version = '1.54';
 $subversion = '0';
-$build = '154';
+$build = '155';
 
 1;