From afb6ae0c7a94c8e40703f680d9609b08a9f89893 Mon Sep 17 00:00:00 2001
From: Renato Botelho <renato@netgate.com>
Date: Fri, 11 Dec 2015 12:57:55 -0200
Subject: Use $ values for vardb_path

---
 src/etc/inc/rrd.inc | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/etc/inc/rrd.inc b/src/etc/inc/rrd.inc
index 0aa7152..3d27e8e 100644
--- a/src/etc/inc/rrd.inc
+++ b/src/etc/inc/rrd.inc
@@ -50,7 +50,7 @@ function dump_rrd_to_xml($rrddatabase, $xmldumpfile) {
 function restore_rrd() {
 	global $g, $config;
 
-	$rrddbpath = "/var/db/rrd/";
+	$rrddbpath = "{$g['vardb_path']}/rrd/";
 	$rrdtool = "/usr/bin/nice -n20 /usr/local/bin/rrdtool";
 
 	$rrdrestore = "";
@@ -211,7 +211,7 @@ function enable_rrd_graphing() {
 		echo gettext("Generating RRD graphs...");
 	}
 
-	$rrddbpath = "/var/db/rrd/";
+	$rrddbpath = "{$g['vardb_path']}/rrd/";
 	$rrdgraphpath = "/usr/local/www/rrd";
 
 	$traffic = "-traffic.rrd";
@@ -323,11 +323,11 @@ function enable_rrd_graphing() {
 		}
 
 		if (platform_booting()) {
-			if (!is_dir("{$g['vardb_path']}/rrd")) {
-				mkdir("{$g['vardb_path']}/rrd", 0775);
+			if (!is_dir($rrddbpath)) {
+				mkdir($rrddbpath, 0775);
 			}
 
-			@chown("{$g['vardb_path']}/rrd", "nobody");
+			@chown($rrddbpath, "nobody");
 		}
 
 		/* process all real and pseudo interfaces */
-- 
cgit v1.1