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:10 -0500 |
commit | ad9b77f9ebef8a87e1ab912075bbcd50c02b27de (patch) | |
tree | e340a64e7e0d73ce52f6289095358c768dd8733f | |
parent | 291fad43870bdb39ef0ab32125b022e268a29cf7 (diff) | |
download | pfsense-ad9b77f9ebef8a87e1ab912075bbcd50c02b27de.zip pfsense-ad9b77f9ebef8a87e1ab912075bbcd50c02b27de.tar.gz |
Update L7 config upgrade code removal. Only file notice if it was actually in use, otherwise it just confuses people.
-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.")); + } } } |