summaryrefslogtreecommitdiffstats
path: root/mdk-stage1
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.org>2004-06-25 04:54:15 +0000
committerOlivier Blin <oblin@mandriva.org>2004-06-25 04:54:15 +0000
commit96ecfbd0955ddb86f22e1ef524edc4f502b65cc3 (patch)
tree3a7b1e81568ba3413a679ca226ef2ddb3f564f64 /mdk-stage1
parenta0af2836316f02ba41a79d85a0469e3e6b5ffbcc (diff)
downloaddrakx-96ecfbd0955ddb86f22e1ef524edc4f502b65cc3.tar
drakx-96ecfbd0955ddb86f22e1ef524edc4f502b65cc3.tar.gz
drakx-96ecfbd0955ddb86f22e1ef524edc4f502b65cc3.tar.bz2
drakx-96ecfbd0955ddb86f22e1ef524edc4f502b65cc3.tar.xz
drakx-96ecfbd0955ddb86f22e1ef524edc4f502b65cc3.zip
unset automatic in ftp/http install when ramdisk can't be loaded
Diffstat (limited to 'mdk-stage1')
-rw-r--r--mdk-stage1/network.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/mdk-stage1/network.c b/mdk-stage1/network.c
index ba2a61424..963dcee53 100644
--- a/mdk-stage1/network.c
+++ b/mdk-stage1/network.c
@@ -1013,6 +1013,7 @@ enum return_type ftp_prepare(void)
if (!use_http_proxy)
ftp_end_data_command(ftp_serv_response);
} else {
+ unset_param(MODE_AUTOMATIC); /* we are in a fallback mode */
return results;
}
@@ -1089,8 +1090,10 @@ enum return_type http_prepare(void)
log_message("HTTP: size of download %d bytes", size);
- if (load_ramdisk_fd(fd, size) != RETURN_OK)
+ if (load_ramdisk_fd(fd, size) != RETURN_OK) {
+ unset_param(MODE_AUTOMATIC); /* we are in a fallback mode */
return RETURN_ERROR;
+ }
add_to_env("METHOD", "http");
sprintf(location_full, "http://%s%s", answers[0], answers[1]);