diff options
| author | Phil Davis <phil.davis@inf.org> | 2015-03-01 21:31:48 +0545 |
|---|---|---|
| committer | Phil Davis <phil.davis@inf.org> | 2015-03-01 21:31:48 +0545 |
| commit | 839966e3968c9d6355fe859b8788563403dc09fc (patch) | |
| tree | b0ede94e875b951bba6cf441010393960f895d6e /etc/inc/upgrade_config.inc | |
| parent | bb235b278014ed84ed3c033531f0cf376c8bd5fa (diff) | |
| download | pfsense-839966e3968c9d6355fe859b8788563403dc09fc.zip pfsense-839966e3968c9d6355fe859b8788563403dc09fc.tar.gz | |
Ancient bug on upgrade_014_to_015
This code looked silly the way it was, with the construct:
$var = $var;
unset($var);
Seems it was accidentally changed to this way many years ago by https://github.com/pfsense/pfsense/commit/588a183b0e58f09932ffef35cc0003cca2313aba
IMHO we want to do the conversion to $config['system']['gateway'] here so that later config conversion will then process it as expected.
Note that in a current (2.2) config there is not $config['system']['gateway'] but that is switched over later in upgrade_021_to_022 - which switches back to $config['interfaces']['wan']['gateway'] and then later config conversions do their thing with that.
I guess this will only effect people who upgrade from some really old config (or monowall?)
Diffstat (limited to 'etc/inc/upgrade_config.inc')
| -rw-r--r-- | etc/inc/upgrade_config.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/etc/inc/upgrade_config.inc b/etc/inc/upgrade_config.inc index 71b97c8..be70d73 100644 --- a/etc/inc/upgrade_config.inc +++ b/etc/inc/upgrade_config.inc @@ -254,7 +254,7 @@ function upgrade_014_to_015() { /* Default route moved */ if (isset($config['interfaces']['wan']['gateway'])) if ($config['interfaces']['wan']['gateway'] <> "") - $config['interfaces']['wan']['gateway'] = $config['interfaces']['wan']['gateway']; + $config['system']['gateway'] = $config['interfaces']['wan']['gateway']; unset($config['interfaces']['wan']['gateway']); /* Queues are no longer interface specific */ |
