summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorjim-p <jimp@pfsense.org>2014-05-21 13:23:31 -0400
committerjim-p <jimp@pfsense.org>2014-05-21 13:30:23 -0400
commitd62a265c918bfd9180fdfca718147d6b6a2862f7 (patch)
treedf7bb186281bb628c06b134e10985912f6efad80 /etc
parent8d6c5f6621417861cbf656ff867e03da3cef7926 (diff)
downloadpfsense-d62a265c918bfd9180fdfca718147d6b6a2862f7.zip
pfsense-d62a265c918bfd9180fdfca718147d6b6a2862f7.tar.gz
Properly handle this rename, and squelch errors if it fails.
Diffstat (limited to 'etc')
-rw-r--r--etc/inc/upgrade_config.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/etc/inc/upgrade_config.inc b/etc/inc/upgrade_config.inc
index 10a2445..7060079 100644
--- a/etc/inc/upgrade_config.inc
+++ b/etc/inc/upgrade_config.inc
@@ -2657,7 +2657,7 @@ function upgrade_080_to_081() {
/* restore the databases, if we have one */
if (restore_rrd()) {
/* Make sure to move the rrd backup out of the way. We will make a new one after converting. */
- rename("{$g['cf_conf_path']}/rrd.tgz", "{$g['cf_conf_path']}/backup");
+ @rename("{$g['cf_conf_path']}/rrd.tgz", "{$g['cf_conf_path']}/backup/rrd.tgz");
}
}
OpenPOWER on IntegriCloud