diff options
| author | Renato Botelho <renato@netgate.com> | 2015-11-23 07:30:00 -0200 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2015-11-23 07:30:00 -0200 |
| commit | da6f84829696e203afe36c6497ff0fda91630a58 (patch) | |
| tree | 5d29a515fc13d77a98e8e3fb71da757a4fffadcc /src/etc | |
| parent | 8d48b23f4b119f6c8061f6c7f1b2e3682446551e (diff) | |
| download | pfsense-da6f84829696e203afe36c6497ff0fda91630a58.zip pfsense-da6f84829696e203afe36c6497ff0fda91630a58.tar.gz | |
Move recently added upgrade code to a new config version
Diffstat (limited to 'src/etc')
| -rw-r--r-- | src/etc/inc/globals.inc | 2 | ||||
| -rw-r--r-- | src/etc/inc/upgrade_config.inc | 32 |
2 files changed, 19 insertions, 15 deletions
diff --git a/src/etc/inc/globals.inc b/src/etc/inc/globals.inc index 18eabf8..b7cc66b 100644 --- a/src/etc/inc/globals.inc +++ b/src/etc/inc/globals.inc @@ -71,7 +71,7 @@ $g = array( "disablecrashreporter" => false, "crashreporterurl" => "https://crashreporter.pfsense.org/crash_reporter.php", "debug" => false, - "latest_config" => "12.8", + "latest_config" => "12.9", "nopkg_platforms" => array("cdrom"), "minimum_ram_warning" => "101", "minimum_ram_warning_text" => "128 MB", diff --git a/src/etc/inc/upgrade_config.inc b/src/etc/inc/upgrade_config.inc index 41a09d8..a09d5d8 100644 --- a/src/etc/inc/upgrade_config.inc +++ b/src/etc/inc/upgrade_config.inc @@ -4056,20 +4056,6 @@ 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; } @@ -4119,4 +4105,22 @@ function upgrade_127_to_128() { unset($config['ipsec']['enable']); } +function upgrade_128_to_129() { + 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); + } +} + ?> |
