Setup gateway monitors and exit in rc.newwanip(v6) if system is booting. Ticket #6186

2 files changed, 18 insertions, 0 deletions

diff --git a/src/etc/rc.newwanip b/src/etc/rc.newwanip
index d7afb2a..05eb960 100755
--- a/src/etc/rc.newwanip
+++ b/src/etc/rc.newwanip
@@ -190,6 +190,15 @@ if (!empty($gre)) {
 	}
 }
 
+if (platform_booting) {
+	// avoid race conditions in many of the below functions that occur during boot
+	// setting up gateways monitor doesn't seem to have issues here, and fixes the
+	// most commonly encountered bugs from earlier versions when everything below
+	// was skipped during boot
+	setup_gateways_monitor();
+	exit;
+}
+
 /*
  * We need to force sync VPNs on such even when the IP is the same for dynamic interfaces.
  * Even with the same IP the VPN software is unhappy with the IP disappearing, and we
diff --git a/src/etc/rc.newwanipv6 b/src/etc/rc.newwanipv6
index 1187f13..160ed441 100755
--- a/src/etc/rc.newwanipv6
+++ b/src/etc/rc.newwanipv6
@@ -145,6 +145,15 @@ system_routing_configure($interface);
 /* reconfigure our gateway monitor */
 setup_gateways_monitor();
 
+if (platform_booting) {
+	// avoid race conditions in many of the below functions that occur during boot
+	// setting up gateways monitor doesn't seem to have issues here, and fixes the
+	// most commonly encountered bugs from earlier versions when everything below
+	// was skipped during boot
+	setup_gateways_monitor();
+	exit;
+}
+
 /* signal filter reload */
 filter_configure();