Ticket #4053, manually merge improvements on rrd backup handling.

pfsense · Dec 1, 2014 · 02b81e8 · 02b81e8
1 parent 64cda11
commit 02b81e8
Showing 1 changed file with 12 additions and 2 deletions.
diff --git 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