summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorErmal LUÇI <eri@pfsense.org>2014-12-04 10:18:44 +0100
committerErmal LUÇI <eri@pfsense.org>2014-12-04 12:35:39 +0100
commit33dc4fbb1c7c2104b19ba17e9e3fb884c6d390d8 (patch)
tree676937aa94bc647e26f8ad66c2e15aca38eca7fa /etc
parentb8959f3c85aa59d7916efca3235798a232c45de2 (diff)
downloadpfsense-33dc4fbb1c7c2104b19ba17e9e3fb884c6d390d8.zip
pfsense-33dc4fbb1c7c2104b19ba17e9e3fb884c6d390d8.tar.gz
Properly unset booting flags to allow dynamic ipsec tunnels to work correctly
Diffstat (limited to 'etc')
-rwxr-xr-xetc/rc8
-rwxr-xr-xetc/rc.bootup1
2 files changed, 6 insertions, 3 deletions
diff --git a/etc/rc b/etc/rc
index 6b9843b..60dcb34 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 1b150e3..1adbe15 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) {
OpenPOWER on IntegriCloud