diff options
| author | Renato Botelho <renato@netgate.com> | 2017-03-08 14:39:15 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2017-03-08 14:39:15 -0300 |
| commit | 209e95d6520f488dedfdf19b6a5202a014b9f2cc (patch) | |
| tree | c626d9e704cb5e0c8a3ee4b22fbcbb401d87169e /src/etc | |
| parent | b25977ab972f5a3ea100ff71ee3c62dc98a2c785 (diff) | |
| parent | 75a1149e0104561446e6f90f98d98c6c13c52996 (diff) | |
| download | pfsense-209e95d6520f488dedfdf19b6a5202a014b9f2cc.zip pfsense-209e95d6520f488dedfdf19b6a5202a014b9f2cc.tar.gz | |
Merge pull request #3626 from phil-davis/trigger-initial-wizard-7364
Diffstat (limited to 'src/etc')
| -rw-r--r-- | src/etc/inc/config.console.inc | 4 | ||||
| -rwxr-xr-x | src/etc/rc.bootup | 5 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/etc/inc/config.console.inc b/src/etc/inc/config.console.inc index bb2659e..1415e86 100644 --- a/src/etc/inc/config.console.inc +++ b/src/etc/inc/config.console.inc @@ -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"); + } } } diff --git a/src/etc/rc.bootup b/src/etc/rc.bootup index f33b434..60919e0 100755 --- a/src/etc/rc.bootup +++ b/src/etc/rc.bootup @@ -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(); } |
