summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorErmal <eri@pfsense.org>2014-02-17 09:56:37 +0000
committerErmal <eri@pfsense.org>2014-02-17 09:56:37 +0000
commitec96f17d627ab524048ed1f713c61e664d731705 (patch)
tree78fd8d9ae12a32a0b00e1cee5f0c4fa353910b8d /etc
parent378296af776e28c47652fd1268708be73f5f19ad (diff)
downloadpfsense-ec96f17d627ab524048ed1f713c61e664d731705.zip
pfsense-ec96f17d627ab524048ed1f713c61e664d731705.tar.gz
Provide upgrade code after changes done for Ticket #3441
Diffstat (limited to 'etc')
-rw-r--r--etc/inc/globals.inc2
-rw-r--r--etc/inc/upgrade_config.inc16
2 files changed, 17 insertions, 1 deletions
diff --git a/etc/inc/globals.inc b/etc/inc/globals.inc
index c1772b3..19aa2c7 100644
--- a/etc/inc/globals.inc
+++ b/etc/inc/globals.inc
@@ -72,7 +72,7 @@ $g = array(
"disablecrashreporter" => false,
"crashreporterurl" => "http://crashreporter.pfsense.org/crash_reporter.php",
"debug" => false,
- "latest_config" => "10.0",
+ "latest_config" => "10.1",
"nopkg_platforms" => array("cdrom"),
"minimum_ram_warning" => "101",
"minimum_ram_warning_text" => "128 MB",
diff --git a/etc/inc/upgrade_config.inc b/etc/inc/upgrade_config.inc
index cf25e1d..7d8d476 100644
--- a/etc/inc/upgrade_config.inc
+++ b/etc/inc/upgrade_config.inc
@@ -3162,4 +3162,20 @@ function upgrade_099_to_100() {
require_once("/etc/inc/services.inc");
install_cron_job("/usr/bin/nice -n20 newsyslog", false);
}
+
+function upgrade_100_to_101() {
+ global $config, $g;
+
+ if (!is_array($config['voucher']))
+ return;
+
+ foreach ($config['voucher'] as $cpzone => $cp) {
+ if (!is_array($cp['roll']))
+ continue;
+ foreach ($cp['roll'] as $ridx => $rcfg) {
+ if (!empty($rcfg['comment']))
+ $config['voucher'][$cpzone]['roll'][$ridx]['descr'] = $rcfg['comment'];
+ }
+ }
+}
?>
OpenPOWER on IntegriCloud