summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.org>2004-06-11 18:14:32 +0000
committerOlivier Blin <oblin@mandriva.org>2004-06-11 18:14:32 +0000
commite4a5b80d7460fb4ec43e789f7eecf90cf2b8dfdf (patch)
treeafd9c0b5f6149ddc92ee224f81b15b026fa931a8
parentc245d3ac45468252b40e0065c5926f1cc9efce4a (diff)
downloaddrakx-e4a5b80d7460fb4ec43e789f7eecf90cf2b8dfdf.tar
drakx-e4a5b80d7460fb4ec43e789f7eecf90cf2b8dfdf.tar.gz
drakx-e4a5b80d7460fb4ec43e789f7eecf90cf2b8dfdf.tar.bz2
drakx-e4a5b80d7460fb4ec43e789f7eecf90cf2b8dfdf.tar.xz
drakx-e4a5b80d7460fb4ec43e789f7eecf90cf2b8dfdf.zip
do not ask proxy settings if interface wasn't brought up (stupid me)
-rw-r--r--mdk-stage1/network.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/mdk-stage1/network.c b/mdk-stage1/network.c
index 6e018a310..bc7ead230 100644
--- a/mdk-stage1/network.c
+++ b/mdk-stage1/network.c
@@ -659,14 +659,15 @@ static enum return_type intf_select_and_up(char **http_proxy_host, char **http_p
results = bringup_networking(sel_intf);
- 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;
- }
+ if (results == RETURN_OK) {
+ 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;
+ }
- if (results == RETURN_OK)
save_netinfo(sel_intf);
+ }
return results;
}