diff options
| author | pyther@pyther.net <pyther@pyther.net> | 2011-01-02 13:16:53 -0500 |
|---|---|---|
| committer | Dieter Plaetinck <dieter@plaetinck.be> | 2011-01-02 19:30:15 +0100 |
| commit | 0a5c3d98148becd45707d011900d83dc1d94c0cf (patch) | |
| tree | 1d7718d6c0038ff027a0472b4c7e38f787bf0d66 /src/core/procedures/interactive | |
| parent | 270e5760ad2495ba4e245840335ec5d1e05cbd1e (diff) | |
Call target_configure_network directly instead of worker_auto_network.
Will call target_configure_network instead of worker_auto_network in
preconfigure_target. Calling worker_auto_network during
worker_configure_system caused worker_configure_system to never set a
return code. Calling target_configure_network follows the same format
as other methods in preconfigure_target()
worker_auto_network has been removed since no other function calls it.
Signed-off-by: Dieter Plaetinck <dieter@plaetinck.be>
Diffstat (limited to 'src/core/procedures/interactive')
| -rw-r--r-- | src/core/procedures/interactive | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/src/core/procedures/interactive b/src/core/procedures/interactive index 179866c..f499a4b 100644 --- a/src/core/procedures/interactive +++ b/src/core/procedures/interactive @@ -167,23 +167,6 @@ worker_install_bootloader () interactive_install_bootloader } - -worker_auto_network () -{ - # if the user has been through networking setup, it may be useful to export the users' choices to the target system - # networking setup could have happened in a separate process (eg partial-configure-network), so check if the settings file was created to be sure - if [ -f $RUNTIME_DIR/aif-network-settings ] - then - ask_yesno "Do you want to use the network settings from the installer in rc.conf and resolv.conf?\n\nIf you used Proxy settings, they will be written to /etc/profile.d/proxy.sh" || return 0 - if ! target_configure_network - then - show_warning "Automatic network settings propagation failed" "Failed to import current network settings into target system" - return 1 - fi - fi - return 0 -} - # override show_report because this procedure does not use phases, but it's own menu show_report () { |