From 33d5cb7a0fc45e0d3d0b36f9f92df2e79428112c Mon Sep 17 00:00:00 2001
From: smos <seth.mos@dds.nl>
Date: Mon, 21 Feb 2011 13:45:35 +0100
Subject: [PATCH] Hold off on resolve_retry during boot. The rest of the IPsec
 config is already delayed during boot for tunnels with hostnames

---
 etc/inc/ipsec.inc | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/etc/inc/ipsec.inc b/etc/inc/ipsec.inc
index 26532974e7..0eefa9286c 100644
--- a/etc/inc/ipsec.inc
+++ b/etc/inc/ipsec.inc
@@ -145,9 +145,10 @@ function ipsec_get_phase1_src(& $ph1ent) {
 function ipsec_get_phase1_dst(& $ph1ent) {
 
 	$rg = $ph1ent['remote-gateway'];
-	if (!is_ipaddr($rg))
-		return resolve_retry($rg);
-
+	if (!is_ipaddr($rg)) {
+		if(! $g['booting'])
+			return resolve_retry($rg);
+	}
 	if(!is_ipaddr($rg))
 		return false;