diff options
| author | Renato Botelho <garga@FreeBSD.org> | 2014-12-15 16:42:26 -0200 |
|---|---|---|
| committer | Renato Botelho <garga@FreeBSD.org> | 2014-12-15 16:42:26 -0200 |
| commit | 387ab31a976fbacfc0d8e2fde7efb7cb1c4b6b6b (patch) | |
| tree | 9141ec8b6bc5b71587353e7f41a2718f5063302d | |
| parent | 6bb9db05b84257101e409a211e188a9c821fe2a9 (diff) | |
| download | pfsense-387ab31a976fbacfc0d8e2fde7efb7cb1c4b6b6b.zip pfsense-387ab31a976fbacfc0d8e2fde7efb7cb1c4b6b6b.tar.gz | |
Use newline to separate unbound custom options during config upgrade, it should fix #4104
| -rw-r--r-- | etc/inc/upgrade_config.inc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/etc/inc/upgrade_config.inc b/etc/inc/upgrade_config.inc index 41db4a8..7035a7c 100644 --- a/etc/inc/upgrade_config.inc +++ b/etc/inc/upgrade_config.inc @@ -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(); |
