diff options
| author | Luiz Otavio O Souza <luiz@netgate.com> | 2015-11-22 07:23:33 -0600 |
|---|---|---|
| committer | Luiz Otavio O Souza <luiz@netgate.com> | 2015-11-22 07:23:33 -0600 |
| commit | fe4b554825649c7366e166bd48bf76f20278a54c (patch) | |
| tree | e70a568ae3dbaaad00cd181a513ff56cc9a4697f /src/etc | |
| parent | dc0f709e8a6ce7c6d40e8e2ae0742bda22ac642c (diff) | |
| download | pfsense-fe4b554825649c7366e166bd48bf76f20278a54c.zip pfsense-fe4b554825649c7366e166bd48bf76f20278a54c.tar.gz | |
Unset "net.inet.ip.fastforwarding" when upgrading from older versions.
Issue: #5370
Diffstat (limited to 'src/etc')
| -rw-r--r-- | src/etc/inc/upgrade_config.inc | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/src/etc/inc/upgrade_config.inc b/src/etc/inc/upgrade_config.inc index 06293c6..889cbdc 100644 --- a/src/etc/inc/upgrade_config.inc +++ b/src/etc/inc/upgrade_config.inc @@ -4056,6 +4056,20 @@ function upgrade_125_to_126() { function upgrade_126_to_127() { global $config; + /* net.inet.ip.fastforwarding does not exist in 2.3. */ + if (isset($config['sysctl']) && is_array($config['sysctl']) && + isset($config['sysctl']['item']) && is_array($config['sysctl']['item'])) { + $i = 0; + $tmp['item'] = array(); + foreach ($config['sysctl']['item'] as $sysctl) { + if ($sysctl['tunable'] === "net.inet.ip.fastforwarding") + continue; + $tmp['item'][$i++] = $sysctl; + } + $config['sysctl'] = $tmp; + unset($tmp); + } + if (!isset($config['widgets']['sequence'])) { return; } |
