From f518ebd0ecbaa45611e7bfbae96b5489fa78817b Mon Sep 17 00:00:00 2001
From: f0o <f0o@librenms.org>
Date: Mon, 20 Apr 2015 15:57:26 +0000
Subject: [PATCH] Fix filename for rrdcached usage.

---
 includes/rrdtool.inc.php | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/includes/rrdtool.inc.php b/includes/rrdtool.inc.php
index d00d5105ed..b9f81ba299 100644
--- a/includes/rrdtool.inc.php
+++ b/includes/rrdtool.inc.php
@@ -150,10 +150,17 @@ function rrdtool($command, $filename, $options)
 {
   global $config, $debug, $rrd_pipes, $console_color;
 
-  $cmd = "$command $filename $options";
   if ($command != "create" && $config['rrdcached'])
   {
-    $cmd .= " --daemon " . $config['rrdcached'];
+    $filename = str_replace($config['install_dir'],"",$filename);
+    //Some people tend to end paths with '/', let's tolerate that
+    if( $filename[0] == "/" ) {
+      $filename = substr($filename,1);
+    }
+    $filename = str_replace("rrd/","",$filename); //Make sure you use -b /opt/librenms/rrd on your rrdcached!
+    $cmd = "$command $filename $options --daemon " . $config['rrdcached'];
+  } else {
+    $cmd = "$command $filename $options";
   }
 
   if ($config['norrd'])