From 02b81e84d4395a331ea9bf8cff06d02236fb469d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ermal=20LU=C3=87I?= <eri@pfsense.org>
Date: Mon, 1 Dec 2014 09:43:34 +0100
Subject: [PATCH] Ticket #4053, manually merge improvements on rrd backup
 handling.

---
 etc/rc.backup_rrd.sh | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/etc/rc.backup_rrd.sh b/etc/rc.backup_rrd.sh
index 0ae89fe082..408068a6da 100755
--- a/etc/rc.backup_rrd.sh
+++ b/etc/rc.backup_rrd.sh
@@ -6,12 +6,22 @@
 # Save the rrd databases to the config path.
 if [ -d "${RRDDBPATH}" ]; then
 	[ -z "$NO_REMOUNT" ] && /etc/rc.conf_mount_rw
+	[ -f "${CF_CONF_PATH}/rrd.tgz" ] && /bin/rm -f "${CF_CONF_PATH}"/rrd.tgz
+	
+	tgzlist=""
+
 	for rrdfile in "${RRDDBPATH}"/*.rrd ; do
 		xmlfile="${rrdfile%.rrd}.xml"
+		tgzfile="${rrdfile%.rrd}.tgz"
 		/usr/bin/nice -n20 /usr/local/bin/rrdtool dump "$rrdfile" "$xmlfile"
+		cd / && /usr/bin/tar -czf "${tgzfile}" -C / "${RRDDBPATH#/}"/*.xml
+		/bin/rm -f "${RRDDBPATH}"/*.xml
+		tgzlist="${tgzlist} @${tgzfile}"
 	done
-	cd / && tar -czf "${CF_CONF_PATH}"/rrd.tgz -C / "${RRDDBPATH#/}"/*.xml
-	rm "${RRDDBPATH}"/*.xml
+	if [ -n "${tgzlist}" ]; then
+		cd / && /usr/bin/tar -czf "${CF_CONF_PATH}/rrd.tgz" ${tgzlist}
+		/bin/rm -f "${RRDDBPATH}"/*.tgz
+	fi
 	[ -z "$NO_REMOUNT" ] && /etc/rc.conf_mount_ro
 fi