diff options
| author | jim-p <jimp@pfsense.org> | 2014-10-31 10:25:25 -0400 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2014-10-31 10:26:02 -0400 |
| commit | 8560c7568aa60b35c2218c54e9bec873d1023fb8 (patch) | |
| tree | 944f13f3a2123914cf0e536d836c1efa4dee94db | |
| parent | 1ae41bfe84a285c61e2a02acae59f70d73aff2c8 (diff) | |
| download | pfsense-8560c7568aa60b35c2218c54e9bec873d1023fb8.zip pfsense-8560c7568aa60b35c2218c54e9bec873d1023fb8.tar.gz | |
Fix two more instances of rrd.tgz renaming.
| -rw-r--r-- | etc/inc/upgrade_config.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/etc/inc/upgrade_config.inc b/etc/inc/upgrade_config.inc index 0d65db6..ab8a0c4 100644 --- a/etc/inc/upgrade_config.inc +++ b/etc/inc/upgrade_config.inc @@ -1991,7 +1991,7 @@ function upgrade_054_to_055() { /* 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"); } } @@ -3108,7 +3108,7 @@ function upgrade_095_to_096() { /* 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"); } } |
