From: Dirk Koopman <djk@tobit.co.uk>
Date: Tue, 25 Sep 2007 19:07:35 +0000 (+0100)
Subject: fix mrtg to not use /var/* tree in debian/ubuntu
X-Git-Tag: 1.55~60
X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=commitdiff_plain;h=9e21eb1e34089e2aacd9048dc89c434d75c2b91c;p=spider.git

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

diff --git a/Changes b/Changes
index a5a35d08..69dde9cf 100644
--- 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 c6752e90..3871a908 100644
--- 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 d6880a32..60deaa75 100644
--- 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;