From f658bac744c154e2c4d29517825caebc0cd8e83e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ermal=20LU=C3=87I?= <eri@pfsense.org>
Date: Thu, 4 Dec 2014 10:18:44 +0100
Subject: [PATCH] Properly unset booting flags to allow dynamic ipsec tunnels
 to work correctly

---
 etc/rc        | 8 +++++---
 etc/rc.bootup | 1 +
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/etc/rc b/etc/rc
index 6b9843b2ca..60dcb341e2 100755
--- a/etc/rc
+++ b/etc/rc
@@ -413,9 +413,11 @@ echo -n "Launching the init system..."
 /usr/bin/touch $varrunpath/booting
 /etc/rc.bootup
 
-# /etc/rc.bootup unset $g['booting'], remove file right now to be
-# consistent
-/bin/rm $varrunpath/booting
+# /etc/rc.bootup unset $g['booting'], and removes file
+# Be sure the file is removed to not create troubles after
+if [ -f $varrunpath/booting ]; then
+	/bin/rm $varrunpath/booting
+fi
 
 # If a shell was selected from recovery 
 # console then just drop to the shell now.
diff --git a/etc/rc.bootup b/etc/rc.bootup
index 1b150e320a..1adbe15716 100755
--- a/etc/rc.bootup
+++ b/etc/rc.bootup
@@ -442,6 +442,7 @@ system_syslogd_start();
 
 /* done */
 unset($g['booting']);
+@unlink("{$g['varrun_path']}/booting");
 
 /* If there are ipsec dynamic hosts try again to reload the tunnels as rc.newipsecdns does */
 if ($ipsec_dynamic_hosts) {