From b73e5dd641c457ad8acbda259fa066aae49d4d14 Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Thu, 9 Feb 2023 09:38:41 +0100 Subject: [PATCH] system: protect against more scripts on bootup All of these could trigger routing or filter reconfiguration (in turn also routing). --- src/etc/rc.configure_interface | 2 ++ src/etc/rc.reload_all | 2 ++ src/etc/rc.routing_configure | 2 ++ 3 files changed, 6 insertions(+) diff --git a/src/etc/rc.configure_interface b/src/etc/rc.configure_interface index 8c31fdf50..f9875af64 100755 --- a/src/etc/rc.configure_interface +++ b/src/etc/rc.configure_interface @@ -34,6 +34,8 @@ require_once("filter.inc"); require_once("system.inc"); require_once("interfaces.inc"); +exit_on_bootup(); + $argument = isset($argv[1]) ? trim($argv[1]) : 'wan'; interface_configure(true, $argument, true); diff --git a/src/etc/rc.reload_all b/src/etc/rc.reload_all index 0f9afec29..92207cfcc 100755 --- a/src/etc/rc.reload_all +++ b/src/etc/rc.reload_all @@ -36,6 +36,8 @@ require_once("util.inc"); require_once("system.inc"); require_once("interfaces.inc"); +exit_on_bootup(); + if (count($argv) > 1 && is_numeric($argv[1])) { // starting delayed. sleep($argv[1]); diff --git a/src/etc/rc.routing_configure b/src/etc/rc.routing_configure index ed1449d86..909b8a156 100755 --- a/src/etc/rc.routing_configure +++ b/src/etc/rc.routing_configure @@ -33,6 +33,8 @@ require_once 'system.inc'; require_once 'interfaces.inc'; require_once 'filter.inc'; +exit_on_bootup(); + // drop deleted routes foreach (glob("/tmp/delete_route_*.todo") as $filename) { $network = trim(file_get_contents($filename));