diff options
Diffstat (limited to 'loader2/urlinstall.c')
| -rw-r--r-- | loader2/urlinstall.c | 44 |
1 files changed, 4 insertions, 40 deletions
diff --git a/loader2/urlinstall.c b/loader2/urlinstall.c index 27af6b486..302e9b7c0 100644 --- a/loader2/urlinstall.c +++ b/loader2/urlinstall.c @@ -168,8 +168,6 @@ char * mountUrlImage(struct installMethod * method, moduleDeps * modDeps, int flags) { int rc; char * url; - char * devName = NULL; - static struct networkDeviceConfig netDev; struct iurlinfo ui; char needsSecondary = ' '; int dir = 1; @@ -177,50 +175,18 @@ char * mountUrlImage(struct installMethod * method, char * finalPrefix; char * cdurl; - enum { URL_STAGE_IFACE, URL_STAGE_IP, URL_STAGE_MAIN, URL_STAGE_SECOND, - URL_STAGE_FETCH, URL_STAGE_DONE } stage = URL_STAGE_IFACE; + enum { URL_STAGE_MAIN, URL_STAGE_SECOND, URL_STAGE_FETCH, + URL_STAGE_DONE } stage = URL_STAGE_MAIN; enum urlprotocol_t proto = !strcmp(method->name, "FTP") ? URL_METHOD_FTP : URL_METHOD_HTTP; /* JKFIXME: we used to do another ram check here... keep it? */ - initLoopback(); - memset(&ui, 0, sizeof(ui)); - memset(&netDev, 0, sizeof(netDev)); - netDev.isDynamic = 1; while (stage != URL_STAGE_DONE) { switch(stage) { - case URL_STAGE_IFACE: - logMessage("going to pick interface"); - rc = chooseNetworkInterface(kd, loaderData, flags); - if ((rc == LOADER_BACK) || (rc == LOADER_ERROR) || - ((dir == -1) && (rc == LOADER_NOOP))) return NULL; - - devName = loaderData->netDev; - strcpy(netDev.dev.device, devName); - stage = URL_STAGE_IP; - dir = 1; - break; - - case URL_STAGE_IP: - logMessage("going to do getNetConfig"); - - /* populate netDev based on any kickstart data */ - setupNetworkDeviceConfig(&netDev, loaderData, flags); - - rc = readNetConfig(devName, &netDev, flags); - if ((rc == LOADER_BACK) || (rc == LOADER_ERROR) || - ((dir == -1) && (rc == LOADER_NOOP))) { - stage = URL_STAGE_IFACE; - dir = -1; - break; - } - stage = URL_STAGE_MAIN; - dir = 1; - case URL_STAGE_MAIN: if (loaderData->method && *loaderData->method && (!strncmp(loaderData->method, "ftp", 3) || @@ -246,9 +212,7 @@ char * mountUrlImage(struct installMethod * method, dir = 1; break; } else if (urlMainSetupPanel(&ui, proto, &needsSecondary)) { - stage = URL_STAGE_IP; - dir = -1; - break; + return NULL; } /* got required information from user, proceed */ @@ -323,7 +287,6 @@ char * mountUrlImage(struct installMethod * method, sprintf(url, "%s://%s%s/%s", ui.protocol == URL_METHOD_FTP ? "ftp" : "http", login, ui.address, finalPrefix); - writeNetInfo("/tmp/netinfo", &netDev, kd); return url; } @@ -396,6 +359,7 @@ void setKickstartUrl(struct loaderData_s * loaderData, int argc, logMessage("kickstartFromUrl"); optCon = poptGetContext(NULL, argc, (const char **) argv, ksUrlOptions, 0); if ((rc = poptGetNextOpt(optCon)) < -1) { + startNewt(*flagsPtr); newtWinMessage(_("Kickstart Error"), _("OK"), _("Bad argument to Url kickstart method " "command %s: %s"), |