summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuiz Souza <luiz@netgate.com>2018-09-14 16:58:11 -0300
committerLuiz Souza <luiz@netgate.com>2018-09-14 17:01:36 -0300
commit6b3bff7437ff98d1d5f1dcaa0afce67105588efd (patch)
treeb14efdb51b02259b1983be1892593d6fc1f0da2e
parentf8d1fe02de66c90747d81140856daaef7b70ddd0 (diff)
downloadpfsense-6b3bff7437ff98d1d5f1dcaa0afce67105588efd.zip
pfsense-6b3bff7437ff98d1d5f1dcaa0afce67105588efd.tar.gz
Sync the know variables with factory.
(cherry picked from commit fe7523cbbdee119bf71abb93009f44a9f8e47963)
-rw-r--r--src/etc/inc/pfsense-utils.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/etc/inc/pfsense-utils.inc b/src/etc/inc/pfsense-utils.inc
index 18ea92a..ac89a6a 100644
--- a/src/etc/inc/pfsense-utils.inc
+++ b/src/etc/inc/pfsense-utils.inc
@@ -1162,7 +1162,7 @@ function load_loader_conf($loader_conf = NULL, $local = false) {
/* These values should be removed from loader.conf and loader.conf.local
* As they will be replaced when necessary. */
$remove = array("hw.usb.no_pf", "hint.mdio.0.at", "hint.e6000sw.0",
- "vm.pmap.pti");
+ "hw.e6000sw.default_disabled", "vm.pmap.pti");
if (!$local) {
/* These values should only be filtered in loader.conf, not .local */
$remove = array_merge($remove,
OpenPOWER on IntegriCloud