firewall: do not switch gateway on bootup

(cherry picked from commit 0e286b3)
(cherry picked from commit 85fe552)

src/etc/inc/filter.inc

@@ -151,7 +151,7 @@ function ifgroup_setup()
     }
 }
 
-function filter_configure_sync($verbose = false, $load_aliases = true)
+function filter_configure_sync($verbose = false, $load_aliases = true, $switch_gw = true)
 {
     global $config;
 
@@ -252,7 +252,7 @@ function filter_configure_sync($verbose = false, $load_aliases = true)
         }
     }
 
-    if (isset($config['system']['gw_switch_default'])) {
+    if ($switch_gw && isset($config['system']['gw_switch_default'])) {
         // When gateway switching is enabled, we might consider a different default gateway.
         // although this isn't really the right spot for the feature (it's a monitoring/routing decision),
         // we keep it here for now (historical reasons).

src/etc/rc.bootup

@@ -2,7 +2,7 @@
 <?php
 
 /*
- * Copyright (C) 2014-2019 Franco Fichtner <franco@opnsense.org>
+ * Copyright (C) 2014-2023 Franco Fichtner <franco@opnsense.org>
  * Copyright (C) 2004-2009 Scott Ullrich <sullrich@gmail.com>
  * Copyright (C) 2003-2004 Manuel Kasper <mk@neon1.net>
  * Copyright (C) 2009 Erik Kristensen <erik@erikkristensen.com>
@@ -87,12 +87,12 @@ system_resolvconf_generate(true);
 system_hosts_generate(true);
 system_syslog_start(true);
 
-filter_configure_sync(true, false); /* apply default policy before interface setup */
+filter_configure_sync(true, false, false); /* apply default policy before interface setup */
 interfaces_hardware(true);
 interfaces_configure(true);
 system_resolvconf_generate(true); /* requires runtime interface configuration */
 system_hosts_generate(true); /* requires runtime interface configuration */
-filter_configure_sync(true);
+filter_configure_sync(true, true, false);
 plugins_configure('early', true);
 system_routing_configure(true, null, false);
 
@@ -101,7 +101,7 @@ plugins_configure('dhcrelay', true);
 plugins_configure('dns', true);
 
 plugins_configure('monitor', true, [null, true]);
-filter_configure_sync(true);
+filter_configure_sync(true, true, false);
 plugins_configure('vpn', true);
 plugins_configure('bootup', true);
 rrd_configure(true, true);