diff options
| author | Chris Buechler <cmb@pfsense.org> | 2016-05-08 03:14:10 -0500 |
|---|---|---|
| committer | Chris Buechler <cmb@pfsense.org> | 2016-05-08 03:14:46 -0500 |
| commit | 96ca32a2460d8b0018533dc1e9d09fb6448ce74e (patch) | |
| tree | a91c25f1263dcd056a43dea177fbb3a953045a10 /src/etc/inc | |
| parent | 297ace668e4a4ffbf1fb1581e7c765e2ed158e29 (diff) | |
| download | pfsense-96ca32a2460d8b0018533dc1e9d09fb6448ce74e.zip pfsense-96ca32a2460d8b0018533dc1e9d09fb6448ce74e.tar.gz | |
Update L7 config upgrade code removal. Only file notice if it was actually in use, otherwise it just confuses people.
Diffstat (limited to 'src/etc/inc')
| -rw-r--r-- | src/etc/inc/upgrade_config.inc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/etc/inc/upgrade_config.inc b/src/etc/inc/upgrade_config.inc index df90e9a..cf29079 100644 --- a/src/etc/inc/upgrade_config.inc +++ b/src/etc/inc/upgrade_config.inc @@ -4320,16 +4320,20 @@ function upgrade_134_to_135() { function upgrade_135_to_136() { global $config; + $l7_active = false; if (isset($config['l7shaper'])) { - file_notice("L7shaper", gettext("Layer 7 shaping is no longer supported. Its configuration has been removed.")); unset($config['l7shaper']); if (is_array($config['filter']['rule'])) { foreach ($config['filter']['rule'] as $idx => $rule) { if (isset($rule['l7container'])) { unset($config['filter']['rule'][$idx]['l7container']); + $l7_active = true; } } } + if ($l7_active) { + file_notice("L7shaper", gettext("Layer 7 shaping is no longer supported. Its configuration has been removed.")); + } } } |
