From db8005b18639e7d3e6e1ea6319a80eba811f9734 Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Mon, 18 Nov 2024 16:42:52 +0100 Subject: [PATCH] system: ignore monitor status on boot --- src/etc/inc/system.inc | 4 ++-- src/etc/rc.bootup | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/etc/inc/system.inc b/src/etc/inc/system.inc index 3df7011df..a4db7cb8b 100644 --- a/src/etc/inc/system.inc +++ b/src/etc/inc/system.inc @@ -664,7 +664,7 @@ function system_routing_configure($verbose = false, $interface_map = null, $moni $ifdetails = legacy_interfaces_details(); $gateways = new \OPNsense\Routing\Gateways(); - $down_gateways = isset($config['system']['gw_switch_default']) ? return_down_gateways() : []; + $down_gateways = isset($config['system']['gw_switch_default']) && $monitor !== 'ignore' ? return_down_gateways() : []; $routes = json_decode(configd_run('interface routes list -n json'), true) ?? []; foreach ($gateways->gatewaysIndexedByName() as $gateway) { @@ -774,7 +774,7 @@ function system_routing_configure($verbose = false, $interface_map = null, $moni service_log("done.\n", $verbose); - if ($monitor) { + if ($monitor === true) { /* reload requested monitors only or reload in full */ $gwnames = !empty($interface_map) ? [] : null; diff --git a/src/etc/rc.bootup b/src/etc/rc.bootup index b079ca61e..4fafa4307 100755 --- a/src/etc/rc.bootup +++ b/src/etc/rc.bootup @@ -91,7 +91,7 @@ interfaces_configure(true); system_resolver_configure(true); /* adapts to runtime interface configuration */ filter_configure_sync(true); plugins_configure('early', true); -system_routing_configure(true, null, false); +system_routing_configure(true, null, 'ignore'); plugins_configure('dhcp', true); plugins_configure('dns', true);