diff options
author | Ermal LUÇI <eri@pfsense.org> | 2014-12-04 10:18:44 +0100 |
---|---|---|
committer | Ermal LUÇI <eri@pfsense.org> | 2014-12-04 10:18:44 +0100 |
commit | f658bac744c154e2c4d29517825caebc0cd8e83e (patch) | |
tree | 1200eabf4fe7f2529c182740c8352ff775e346ea /etc | |
parent | e26effd34041d9bbb8c712ce3098b5d296967325 (diff) | |
download | pfsense-f658bac744c154e2c4d29517825caebc0cd8e83e.zip pfsense-f658bac744c154e2c4d29517825caebc0cd8e83e.tar.gz |
Properly unset booting flags to allow dynamic ipsec tunnels to work correctly
Diffstat (limited to 'etc')
-rwxr-xr-x | etc/rc | 8 | ||||
-rwxr-xr-x | etc/rc.bootup | 1 |
2 files changed, 6 insertions, 3 deletions
@@ -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) { |