lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-16 09:34:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix config issue in initial setup wizard

Browse Source
This commit is contained in:
Ad Schellevis 2015-03-24 17:17:46 +00:00
parent 0dccde43ba
commit 8f2449cb2c
3 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/etc/inc/pfsense-utils.inc
View File

@ -756,10 +756,10 @@ function reload_all_sync() {
mwexec("/usr/sbin/pwd_mkdb -d /etc/ /etc/master.passwd");
/* restart sshd */
send_event("service restart sshd");
mwexec('/usr/local/etc/rc.sshd');
/* restart webConfigurator if needed */
send_event("service restart webgui");
mwexec('/usr/local/etc/rc.restart_webgui');
}
function setup_serial_port($when = 'save', $path = '')

1
src/etc/rc.reload_all
View File

@ -37,6 +37,5 @@ require_once("captiveportal.inc");
log_error("rc.reload_all: Reloading all configuration settings.");
reload_all_sync();
sleep(2);
log_error("rc.reload_all: Reloading filter configuration.");
filter_configure_sync();

25
src/www/wizards/setup_wizard.xml
View File

@ -571,16 +571,6 @@
<type>submit</type>
</field>
</fields>
</step>
<step>
<id>8</id>
<title>Reload in progress</title>
<description>
A reload is now in progress. Please wait. &lt;p&gt;
&lt;meta http-equiv="refresh" content="5; url=wizard.php?xml=setup_wizard.xml&amp;stepid=8" &gt;
&lt;p&gt;
The wizard will redirect to the next step once the reload is completed.
</description>
<stepafterformdisplay>
<![CDATA[
$config['system']['hostname'] = $config['wizardtemp']['system']['hostname'];
@ -615,8 +605,21 @@
}
unset($config['wizardtemp']);
write_config();
]]>
</stepafterformdisplay>
</step>
<step>
<id>8</id>
<title>Reload in progress</title>
<description>
A reload is now in progress. Please wait. &lt;p&gt;
&lt;meta http-equiv="refresh" content="5; url=wizard.php?xml=setup_wizard.xml&amp;stepid=8" &gt;
&lt;p&gt;
The wizard will redirect to the next step once the reload is completed.
</description>
<stepafterformdisplay>
<![CDATA[
reload_all();
mwexec_bg("/usr/local/etc/rc.update_bogons now");
]]>
</stepafterformdisplay>
</step>