summaryrefslogtreecommitdiffstats
path: root/etc/inc/upgrade_config.inc
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:29:52 -0400
commite1854cad12e91e83cede2595dab9a2c66fefd10c (patch)
tree7ac99ccb2a4d0d747e1832a1c7e79af7f26e1c0b /etc/inc/upgrade_config.inc
parent672e28f3d6ff02c21f9e771656fc984531a5782f (diff)
downloadpfsense-e1854cad12e91e83cede2595dab9a2c66fefd10c.zip
pfsense-e1854cad12e91e83cede2595dab9a2c66fefd10c.tar.gz
Properly handle this rename, and squelch errors if it fails.
Diffstat (limited to 'etc/inc/upgrade_config.inc')
-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 f001200..c33deb1 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