diff options
| -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> |
