summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRenato Botelho <garga@FreeBSD.org>2013-07-02 13:22:32 -0300
committerRenato Botelho <garga@FreeBSD.org>2013-07-02 13:22:32 -0300
commit5e3356d7273b2374d06054fa84d5f29d335bdbb7 (patch)
tree9c6f563356a4280fb3d1f3a8a4794eef01450b42
parenta13acc0e0444939b58988992338f0fb217f81b15 (diff)
downloadpfsense-5e3356d7273b2374d06054fa84d5f29d335bdbb7.zip
pfsense-5e3356d7273b2374d06054fa84d5f29d335bdbb7.tar.gz
Repect global conf_path
-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 91de2f5..fad204e 100644
--- a/etc/inc/upgrade_config.inc
+++ b/etc/inc/upgrade_config.inc
@@ -2892,7 +2892,7 @@ function upgrade_085_to_086() {
if (!empty($vipchg)) {
file_put_contents("{$g['tmp_path']}/vipreplace", $vipchg);
write_config();
- mwexec("/usr/bin/sed -I \"\" -f {$g['tmp_path']}/vipreplace /conf/config.xml");
+ mwexec("/usr/bin/sed -I \"\" -f {$g['tmp_path']}/vipreplace {$g['conf_path']}/config.xml");
require_once("config.lib.inc");
unset($config);
$config = parse_config(true);
OpenPOWER on IntegriCloud