diff options
author | Chris Buechler <cmb@pfsense.org> | 2016-05-07 19:59:42 -0500 |
---|---|---|
committer | Chris Buechler <cmb@pfsense.org> | 2016-05-07 20:00:38 -0500 |
commit | d239edd157ec90fd04caad6ef35a3e32ae228c90 (patch) | |
tree | 1f92af4170b34595c80fd0c056885e8a953c0556 /src | |
parent | adff31362e79286a74d114c5015469e369833c85 (diff) | |
download | pfsense-d239edd157ec90fd04caad6ef35a3e32ae228c90.zip pfsense-d239edd157ec90fd04caad6ef35a3e32ae228c90.tar.gz |
Setup gateway monitors and exit in rc.newwanip(v6) if system is booting. Ticket #6186
Diffstat (limited to 'src')
-rwxr-xr-x | src/etc/rc.newwanip | 9 | ||||
-rwxr-xr-x | src/etc/rc.newwanipv6 | 9 |
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(); |