summaryrefslogtreecommitdiffstats
path: root/src/etc
diff options
context:
space:
mode:
authorRenato Botelho <renato@netgate.com>2016-03-11 09:28:33 -0300
committerRenato Botelho <renato@netgate.com>2016-03-11 09:28:43 -0300
commitae04affe85f9b2d0171d50c18c17cfad06941238 (patch)
treef945787fbd3a4320d6379ec435b2982fa42c6d7f /src/etc
parentccdb9c3bf9707b0ec8054bddfb81f2800772fd54 (diff)
downloadpfsense-ae04affe85f9b2d0171d50c18c17cfad06941238.zip
pfsense-ae04affe85f9b2d0171d50c18c17cfad06941238.tar.gz
Respect globals_override.inc
Diffstat (limited to 'src/etc')
-rw-r--r--src/etc/inc/globals.inc6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/etc/inc/globals.inc b/src/etc/inc/globals.inc
index 8969add..32cf355 100644
--- a/src/etc/inc/globals.inc
+++ b/src/etc/inc/globals.inc
@@ -115,9 +115,6 @@ $g = array(
"language" => "en_US"
);
-/* Read all XML files in following dir and load menu entries */
-$g["ext_menu_path"] = "/usr/local/share/{$g['product_name']}/menu";
-
/* IP TOS flags */
$iptos = array("lowdelay", "throughput", "reliability");
@@ -198,6 +195,9 @@ if (file_exists("/etc/inc/globals_override.inc")) {
@include("globals_override.inc");
}
+/* Read all XML files in following dir and load menu entries */
+$g["ext_menu_path"] = "/usr/local/share/{$g['product_name']}/menu";
+
function platform_booting($on_console = false) {
global $g;
OpenPOWER on IntegriCloud