summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorErmal <eri@pfsense.org>2014-11-28 21:47:30 +0000
committerErmal <eri@pfsense.org>2014-11-28 21:47:30 +0000
commit2388a1ace93c831d203d541d38ad8e05d80ff560 (patch)
tree94a32f3c132b3e32923b7161e3427e4c22c98ce7 /etc
parent7b9dfd6b32ca3d54c723295334416bcc7e5deb8a (diff)
parent8676899f08691ad82d8d17473efd05e04256105b (diff)
downloadpfsense-2388a1ace93c831d203d541d38ad8e05d80ff560.zip
pfsense-2388a1ace93c831d203d541d38ad8e05d80ff560.tar.gz
Merge pull request #1354 from phil-davis/patch-2
Diffstat (limited to 'etc')
-rwxr-xr-xetc/rc.backup_rrd.sh14
1 files changed, 9 insertions, 5 deletions
diff --git a/etc/rc.backup_rrd.sh b/etc/rc.backup_rrd.sh
index feffa27..408068a 100755
--- a/etc/rc.backup_rrd.sh
+++ b/etc/rc.backup_rrd.sh
@@ -7,16 +7,20 @@
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 -rf "${CF_CONF_PATH}"/rrd.tar -C / "${RRDDBPATH#/}"/*.xml
+ cd / && /usr/bin/tar -czf "${tgzfile}" -C / "${RRDDBPATH#/}"/*.xml
/bin/rm -f "${RRDDBPATH}"/*.xml
+ tgzlist="${tgzlist} @${tgzfile}"
done
- if [ -f "${CF_CONF_PATH}/rrd.tar" ]; then
- /usr/bin/gzip "${CF_CONF_PATH}/rrd.tar"
- /bin/mv "${CF_CONF_PATH}/rrd.tar.gz" "${CF_CONF_PATH}/rrd.tgz"
+ 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
OpenPOWER on IntegriCloud