summaryrefslogtreecommitdiffstats
path: root/etc/inc/upgrade_config.inc
diff options
context:
space:
mode:
authorRenato Botelho <garga@FreeBSD.org>2014-12-18 13:51:32 -0200
committerRenato Botelho <garga@FreeBSD.org>2014-12-18 13:52:12 -0200
commit0fcab48bb4081421d4b118992257c7d1c46d5561 (patch)
tree455ac86e2de6614d830b572b01566478af642a50 /etc/inc/upgrade_config.inc
parent65a6e535c4fe3dc288dc3a5adb1f9c2dd0b78088 (diff)
downloadpfsense-0fcab48bb4081421d4b118992257c7d1c46d5561.zip
pfsense-0fcab48bb4081421d4b118992257c7d1c46d5561.tar.gz
Replace ; by newlines when upgrading custom_options from unbound packages, it's related to ticket #4090
Diffstat (limited to 'etc/inc/upgrade_config.inc')
-rw-r--r--etc/inc/upgrade_config.inc3
1 files changed, 3 insertions, 0 deletions
diff --git a/etc/inc/upgrade_config.inc b/etc/inc/upgrade_config.inc
index d0e594f..5226c2f 100644
--- a/etc/inc/upgrade_config.inc
+++ b/etc/inc/upgrade_config.inc
@@ -3455,6 +3455,9 @@ function upgrade_110_to_111() {
}
}
+ if (isset($new['custom_options']) && !empty($new['custom_options']))
+ $new['custom_options'] = str_replace(';', "\n", $new['custom_options']);
+
/* Following options were removed, bring them as custom_options */
if (isset($pkg['stats']) && $pkg['stats'] == "on") {
if (isset($pkg['stats_interval']))
OpenPOWER on IntegriCloud