diff options
| author | Dieter Plaetinck <dieter@plaetinck.be> | 2010-12-28 17:56:00 +0100 |
|---|---|---|
| committer | Dieter Plaetinck <dieter@plaetinck.be> | 2010-12-28 17:56:00 +0100 |
| commit | 25f7a0471340e8d6c2b37e3c75aa7d0ae209d09d (patch) | |
| tree | 8a5c921946125e659df4adf4b2baf733c764d482 /src/core/procedures | |
| parent | febffe7a9f6d7dd27eb7e382e11ea9fbda62bb26 (diff) | |
cleanup worker_auto_network() / target_configure_network() code
The only thing needed to know before calling target_configure_network()
is whether $RUNTIME_DIR/aif-network-settings exists; if that exists,
network setup has been run sucessfully and all values are known.
It's up to target_configure_network() to source that, which means
worker_auto_network() functions can become simpler.
Also, variable name cleanup: s/S_DHCP/DHCP/
Diffstat (limited to 'src/core/procedures')
| -rw-r--r-- | src/core/procedures/base | 9 | ||||
| -rw-r--r-- | src/core/procedures/interactive | 25 |
2 files changed, 14 insertions, 20 deletions
diff --git a/src/core/procedures/base b/src/core/procedures/base index fbab6f7..dd05773 100644 --- a/src/core/procedures/base +++ b/src/core/procedures/base @@ -159,10 +159,11 @@ worker_install_packages () worker_auto_network () { - [ "$S_DHCP" = 1 ] && target_configure_network dhcp "$PROXY_HTTP" "$PROXY_FTP" && return 0 - [ "$S_DHCP" = 0 ] && target_configure_network fixed "$PROXY_HTTP" "$PROXY_FTP" && return 0 - [ "$S_DHCP" != 1 -a "$S_DHCP" != 0 ] && return 0 - return 1 + if [ -f $RUNTIME_DIR/aif-network-settings ] + then + target_configure_network || return $? + fi + return 0 } diff --git a/src/core/procedures/interactive b/src/core/procedures/interactive index 5ee8cd7..03b9c1a 100644 --- a/src/core/procedures/interactive +++ b/src/core/procedures/interactive @@ -177,25 +177,18 @@ worker_install_bootloader () worker_auto_network () { - ask=0 - # if the user has been through networking setup and if any of these variables is set, it may be useful to export the users' choices to the target system - if [ "$S_DHCP" = 1 -o "$S_DHCP" = 0 ] && [ -n "$PROXY_HTTP$PROXY_FTP$DNS$INTERFACE$SUBNET$GW$BROADCAST" ] - then - ask=1 - # if the variables are not set but the network settings file exists, the user has probably run the runtime_network in a separate process (eg partial-configure-network) - # in that case, lets source the file and check again - elif [ -f $RUNTIME_DIR/aif-network-settings ] && source $RUNTIME_DIR/aif-network-settings && [ "$S_DHCP" = 1 -o "$S_DHCP" = 0 ] && [ -n "$PROXY_HTTP$PROXY_FTP$DNS$INTERFACE$SUBNET$GW$BROADCAST" ] - then - ask=1 - fi - if [ "$ask" = 1 ] + # 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 - [ "$S_DHCP" = 1 ] && target_configure_network dhcp "$PROXY_HTTP" "$PROXY_FTP" && return 0 - [ "$S_DHCP" = 0 ] && target_configure_network fixed "$PROXY_HTTP" "$PROXY_FTP" && return 0 - show_warning "Automatic network settings propagation failed" "Failed to import current network settings into target system" - return 1 + 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 } worker_abort_installer () |