From 77aa218ba8656f5fd94c47442efd2f4661d230df Mon Sep 17 00:00:00 2001 From: Ad Schellevis Date: Fri, 21 Aug 2020 15:54:35 +0200 Subject: [PATCH] firewall -> aliases: bogons not loaded on initial load, due to bogons aliases registered again without file reference. for https://github.com/opnsense/core/issues/4277 --- src/etc/inc/filter.inc | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/etc/inc/filter.inc b/src/etc/inc/filter.inc index 928358574..2d768a898 100644 --- a/src/etc/inc/filter.inc +++ b/src/etc/inc/filter.inc @@ -680,10 +680,6 @@ function filter_generate_aliases() $aliases .= "table persist\n"; $aliases .= "\n# Other tables\n"; $aliases .= "table \n"; - $aliases .= "table persist file \"/usr/local/etc/bogons\"\n"; - if (is_bogonsv6_used()) { - $aliases .= "table persist file \"/usr/local/etc/bogonsv6\"\n"; - } $aliases .= "\n# User Aliases\n"; $aliasObject = new \OPNsense\Firewall\Alias(); @@ -709,6 +705,11 @@ function filter_generate_aliases() } } + $aliases .= "table persist file \"/usr/local/etc/bogons\"\n"; + if (is_bogonsv6_used()) { + $aliases .= "table persist file \"/usr/local/etc/bogonsv6\"\n"; + } + return $aliases; }