summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorErmal LUÇI <eri@pfsense.org>2014-12-04 10:19:00 +0100
committerErmal LUÇI <eri@pfsense.org>2014-12-04 12:35:45 +0100
commit47eb263dd370f4c702716ea5aecf6dde4cab95cf (patch)
treed457fe122c76d760f49b8ae4311ef0fd0d7d52af /etc
parent33dc4fbb1c7c2104b19ba17e9e3fb884c6d390d8 (diff)
downloadpfsense-47eb263dd370f4c702716ea5aecf6dde4cab95cf.zip
pfsense-47eb263dd370f4c702716ea5aecf6dde4cab95cf.tar.gz
Proper fix was put on f658bac
Revert "Can't skip this if booting, ends up breaking config. Ticket #4071" This reverts commit effb3a3cfe4e57b781f35ba8a145eb627014d8ce.
Diffstat (limited to 'etc')
-rw-r--r--etc/inc/vpn.inc3
1 files changed, 2 insertions, 1 deletions
diff --git a/etc/inc/vpn.inc b/etc/inc/vpn.inc
index 37fde5d..54b4347 100644
--- a/etc/inc/vpn.inc
+++ b/etc/inc/vpn.inc
@@ -202,7 +202,8 @@ function vpn_ipsec_configure($ipchg = false)
if (!is_ipaddr($rg)) {
$filterdns_list[] = "{$rg}";
add_hostname_to_watch($rg);
- $rg = resolve_retry($rg);
+ if (!platform_booting())
+ $rg = resolve_retry($rg);
if (!is_ipaddr($rg))
continue;
}
OpenPOWER on IntegriCloud