summaryrefslogtreecommitdiffstats
path: root/src
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:20 -0300
commit4ed2e462ffd4cde5826b4f3e2455ad390e1e2a91 (patch)
tree674a666cb6de0de85a62e66d9ed3b0a6ef72f2c2 /src
parent6c1f2a1ce66e201ddfdaf926275c021161b65ad2 (diff)
downloadpfsense-4ed2e462ffd4cde5826b4f3e2455ad390e1e2a91.zip
pfsense-4ed2e462ffd4cde5826b4f3e2455ad390e1e2a91.tar.gz
Add a function to be called every time convert_config() runs
Diffstat (limited to 'src')
-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 0ee64b9..5d0216e 100644
--- a/src/etc/inc/config.lib.inc
+++ b/src/etc/inc/config.lib.inc
@@ -367,6 +367,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 5a24d9b..ff5020c 100644
--- a/src/etc/inc/upgrade_config.inc
+++ b/src/etc/inc/upgrade_config.inc
@@ -5387,4 +5387,16 @@ function upgrade_168_to_169() {
);
}
+/*
+ * 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