diff options
| author | Scott Ullrich <sullrich@pfsense.org> | 2006-02-26 00:27:08 +0000 |
|---|---|---|
| committer | Scott Ullrich <sullrich@pfsense.org> | 2006-02-26 00:27:08 +0000 |
| commit | e295675f8ff89e9555722b8825282972e1a72e74 (patch) | |
| tree | 5539708daa59fa566c1c6ad2fbc0d767abc0b496 /etc/inc/config.inc | |
| parent | 59f6fb8ed81682fa614bd5c33154b3a854a34bec (diff) | |
| download | pfsense-e295675f8ff89e9555722b8825282972e1a72e74.zip pfsense-e295675f8ff89e9555722b8825282972e1a72e74.tar.gz | |
MFC
Shaper fixes from BillM
Diffstat (limited to 'etc/inc/config.inc')
| -rw-r--r-- | etc/inc/config.inc | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/etc/inc/config.inc b/etc/inc/config.inc index f7b750b..a77e30a 100644 --- a/etc/inc/config.inc +++ b/etc/inc/config.inc @@ -744,6 +744,14 @@ function convert_config() { $config['interfaces']['wan']['gateway'] = $config['system']['gateway']; $config['version'] = "2.2"; } + /* Convert 2.2 -> 2.3 */ + if ($config['version'] == "2.2") { + if(isset($config['shaper'])) { + /* wipe previous shaper configuration */ + unset($config['shaper']); + } + $config['version'] = "2.3"; + } if ($prev_version != $config['version']) write_config("Upgraded config version level from {$prev_version} to {$config['version']}"); @@ -1434,4 +1442,4 @@ function start_devd() { exec("/sbin/devd"); } -?>
\ No newline at end of file +?> |
