diff options
| author | Olivier Blin <oblin@mandriva.org> | 2004-06-14 17:36:50 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.org> | 2004-06-14 17:36:50 +0000 |
| commit | 0ba4d9ecf33478f6114039101521c47c37d26703 (patch) | |
| tree | 27212d20f0d73150256bc5613a53f01fe8895916 | |
| parent | 60ebf8c7eebb9db20ca9d77e0e8b5498f43293b7 (diff) | |
| download | drakx-0ba4d9ecf33478f6114039101521c47c37d26703.tar drakx-0ba4d9ecf33478f6114039101521c47c37d26703.tar.gz drakx-0ba4d9ecf33478f6114039101521c47c37d26703.tar.bz2 drakx-0ba4d9ecf33478f6114039101521c47c37d26703.tar.xz drakx-0ba4d9ecf33478f6114039101521c47c37d26703.zip | |
fix brown paper bug combo
| -rw-r--r-- | mdk-stage1/network.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/mdk-stage1/network.c b/mdk-stage1/network.c index af384c427..1e53db5c9 100644 --- a/mdk-stage1/network.c +++ b/mdk-stage1/network.c @@ -654,16 +654,16 @@ static enum return_type intf_select_and_up(char **http_proxy_host, char **http_p num_interfaces++; } + sel_intf->http_proxy_host = ""; + sel_intf->http_proxy_port = ""; + results = bringup_networking(sel_intf); if (results == RETURN_OK) { - intf->http_proxy_host = ""; - intf->http_proxy_port = ""; - if (http_proxy_host && http_proxy_port) { - intf_get_http_proxy(intf); - *http_proxy_host = intf->http_proxy_host; - *http_proxy_port = intf->http_proxy_port; + intf_get_http_proxy(sel_intf); + *http_proxy_host = sel_intf->http_proxy_host; + *http_proxy_port = sel_intf->http_proxy_port; } save_netinfo(sel_intf); @@ -1059,7 +1059,7 @@ static int choose_mirror_from_list(char *http_proxy_host, char *http_proxy_port, } } - hosts[host_index+1] = NULL; + hosts[host_index] = NULL; results = ask_from_list("Please select a mirror in the list, " "or cancel to specify it.", |