summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRenato Botelho <renato@netgate.com>2017-08-16 08:43:24 -0300
committerRenato Botelho <renato@netgate.com>2017-08-16 11:03:12 -0300
commit3bf669d5337ac66e78397c1b238d287333d10736 (patch)
tree51c1d56cd477bb699c3ac154d66417872a6a2ba1
parent388189cf5ec4f3e0d70a3edf89a984f78d252d55 (diff)
downloadpfsense-3bf669d5337ac66e78397c1b238d287333d10736.zip
pfsense-3bf669d5337ac66e78397c1b238d287333d10736.tar.gz
Add a function to be called every time convert_config() runs
-rw-r--r--src/etc/inc/config.lib.inc2
-rw-r--r--src/etc/inc/upgrade_config.inc12
2 files changed, 14 insertions, 0 deletions
diff --git a/src/etc/inc/config.lib.inc b/src/etc/inc/config.lib.inc
index 00eadd9..469cead 100644
--- a/src/etc/inc/config.lib.inc
+++ b/src/etc/inc/config.lib.inc
@@ -468,6 +468,8 @@ function convert_config() {
}
}
+ additional_config_upgrade();
+
$now = date("H:i:s");
log_error(sprintf(gettext("Ended Configuration upgrade at %s"), $now));
diff --git a/src/etc/inc/upgrade_config.inc b/src/etc/inc/upgrade_config.inc
index c4a7871..2d215ff 100644
--- a/src/etc/inc/upgrade_config.inc
+++ b/src/etc/inc/upgrade_config.inc
@@ -5057,4 +5057,16 @@ function upgrade_157_to_158() {
}
}
+/*
+ * Special function that is called independent of current config version. It's
+ * a workaround to have config_upgrade running on older versions after next
+ * config version was already taken by newer pfSense.
+ *
+ * XXX Change the way we handle config version to make it based on product
+ * version
+ */
+function additional_config_upgrade() {
+ global $config;
+}
+
?>
OpenPOWER on IntegriCloud