diff options
| author | Phil Davis <phil.davis@inf.org> | 2017-03-08 13:57:01 +0545 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2017-03-08 14:40:12 -0300 |
| commit | 25d8c2ce32596b634c9b7d5df6469acb09450fa0 (patch) | |
| tree | d29461a3a6129d26e3851f6e4187c0db0ca57a68 | |
| parent | 5bc83b28f2b0b69cc8c5099c53c2408fefa3bbd9 (diff) | |
| download | pfsense-25d8c2ce32596b634c9b7d5df6469acb09450fa0.zip pfsense-25d8c2ce32596b634c9b7d5df6469acb09450fa0.tar.gz | |
Fix #7364 Console assigned VLAN disappears after reboot
(cherry picked from commit 75a1149e0104561446e6f90f98d98c6c13c52996)
| -rw-r--r-- | src/etc/inc/config.console.inc | 4 | ||||
| -rwxr-xr-x | src/etc/rc.bootup | 5 | ||||
| -rw-r--r-- | src/usr/local/www/wizards/setup_wizard.xml | 1 |
3 files changed, 9 insertions, 1 deletions
diff --git a/src/etc/inc/config.console.inc b/src/etc/inc/config.console.inc index 475d1a3..0378a9d 100644 --- a/src/etc/inc/config.console.inc +++ b/src/etc/inc/config.console.inc @@ -487,6 +487,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 322a93d..d626520 100755 --- a/src/etc/rc.bootup +++ b/src/etc/rc.bootup @@ -189,7 +189,10 @@ echo "done.\n"; /* 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(); } diff --git a/src/usr/local/www/wizards/setup_wizard.xml b/src/usr/local/www/wizards/setup_wizard.xml index b0d2da2..aad8b71 100644 --- a/src/usr/local/www/wizards/setup_wizard.xml +++ b/src/usr/local/www/wizards/setup_wizard.xml @@ -68,6 +68,7 @@ <stepbeforeformdisplay> conf_mount_rw(); unlink_if_exists('/conf/trigger_initial_wizard'); + unlink_if_exists('/conf/assign_complete'); conf_mount_ro(); </stepbeforeformdisplay> </step> |
