mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use newline to separate unbound custom options during config upgrade, it should fix #4104

Browse Source
This commit is contained in:
Renato Botelho 2014-12-15 16:42:26 -02:00
parent 6bb9db05b8
commit 387ab31a97
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
etc/inc/upgrade_config.inc
View File

@ -3458,13 +3458,13 @@ function upgrade_110_to_111() {
/* Following options were removed, bring them as custom_options */
if (isset($pkg['stats']) && $pkg['stats'] == "on") {
if (isset($pkg['stats_interval']))
$new['custom_options'] .= (empty($new['custom_options']) ? "" : ";") . "statistics-interval: {$pkg['stats_interval']}";
$new['custom_options'] .= (empty($new['custom_options']) ? "" : "\n") . "statistics-interval: {$pkg['stats_interval']}";
if (isset($pkg['cumulative_stats']))
$new['custom_options'] .= (empty($new['custom_options']) ? "" : ";") . "statistics-cumulative: {$pkg['cumulative_stats']}";
$new['custom_options'] .= (empty($new['custom_options']) ? "" : "\n") . "statistics-cumulative: {$pkg['cumulative_stats']}";
if (isset($pkg['extended_stats']) && $pkg['extended_stats'] == "on")
$new['custom_options'] .= (empty($new['custom_options']) ? "" : ";") . "extended-statistics: yes";
$new['custom_options'] .= (empty($new['custom_options']) ? "" : "\n") . "extended-statistics: yes";
else
$new['custom_options'] .= (empty($new['custom_options']) ? "" : ";") . "extended-statistics: no";
$new['custom_options'] .= (empty($new['custom_options']) ? "" : "\n") . "extended-statistics: no";
}
$new['acls'] = array();