mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3626 from phil-davis/trigger-initial-wizard-7364

Browse Source
This commit is contained in:
Renato Botelho 2017-03-08 14:39:15 -03:00
commit 209e95d652
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/etc/inc/config.console.inc
View File

@ -377,6 +377,10 @@ EOD;
touch("{$g['tmp_path']}/assign_complete");
if (file_exists("/conf/trigger_initial_wizard")) {
// Let the system know that the interface assign part of initial setup has been done.
touch("{$g['conf_path']}/assign_complete");
}
}
}

5
src/etc/rc.bootup
View File

@ -138,7 +138,10 @@ if (mwexec("/bin/kenv -q pfSense.boot 2>/dev/null") != 0) {
/* run any early shell commands specified in config.xml */
system_do_shell_commands(1);
if (file_exists("/conf/trigger_initial_wizard")) {
// Only do the alternate interface checks if:
// 1) The user has not yet run the initial wizard; and
// 2) The user has not used the console menu to setup interface assignments
if (file_exists("/conf/trigger_initial_wizard") && !file_exists("/conf/assign_complete")) {
check_for_alternate_interfaces();
}

1
src/usr/local/www/wizards/setup_wizard.xml
View File

@ -35,6 +35,7 @@
</fields>
<stepbeforeformdisplay>
unlink_if_exists('/conf/trigger_initial_wizard');
unlink_if_exists('/conf/assign_complete');
</stepbeforeformdisplay>
</step>
<step>