diff options
| author | jim-p <jimp@pfsense.org> | 2011-06-01 09:00:09 -0400 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2011-06-01 09:00:09 -0400 |
| commit | 58005e521346eea230c564aacf34b0820b9a6123 (patch) | |
| tree | 7242c84ccd28d9044a7c0f08f7ecfee952634a65 /etc/inc/upgrade_config.inc | |
| parent | e5770bc233d9a6a9a335b02490d7c4607410cd95 (diff) | |
| parent | 97c1f2684c5dd225075fec08148f084ff190af0a (diff) | |
| download | pfsense-58005e521346eea230c564aacf34b0820b9a6123.zip pfsense-58005e521346eea230c564aacf34b0820b9a6123.tar.gz | |
Merge remote branch 'upstream/master'
Conflicts:
conf.default/config.xml
etc/inc/filter.inc
etc/inc/globals.inc
etc/inc/pfsense-utils.inc
etc/inc/upgrade_config.inc
usr/local/www/interfaces.php
Diffstat (limited to 'etc/inc/upgrade_config.inc')
| -rw-r--r-- | etc/inc/upgrade_config.inc | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/etc/inc/upgrade_config.inc b/etc/inc/upgrade_config.inc index 1646292..ccd5629 100644 --- a/etc/inc/upgrade_config.inc +++ b/etc/inc/upgrade_config.inc @@ -2490,8 +2490,13 @@ function upgrade_077_to_078() { $config['pptpd']['radius'] = $radarr; } } - function upgrade_078_to_079() { + global $g; + /* Delete old and unused RRD file */ + unlink_if_exists("{$g['vardb_path']}/rrd/captiveportal-totalusers.rrd"); +} + +function upgrade_079_to_080() { global $config; global $g; @@ -2577,7 +2582,7 @@ function upgrade_078_to_079() { } } -function upgrade_079_to_080() { +function upgrade_080_to_081() { global $config; /* enable the allow IPv6 toggle */ $config['system']['ipv6allow'] = true; |
