[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[PATCH 18/29] Remove the unused mountUrlImage function.



---
 loader/urlinstall.c |   87 ---------------------------------------------------
 1 files changed, 0 insertions(+), 87 deletions(-)

diff --git a/loader/urlinstall.c b/loader/urlinstall.c
index 1c307cf..3ba5a6b 100644
--- a/loader/urlinstall.c
+++ b/loader/urlinstall.c
@@ -224,93 +224,6 @@ int promptForUrl(struct loaderData_s *loaderData) {
     return LOADER_OK;
 }
 
-char *mountUrlImage(struct installMethod *method, char *location,
-                    struct loaderData_s *loaderData) {
-    urlInstallData *stage2Data = (urlInstallData *) loaderData->stage2Data;
-    struct iurlinfo ui;
-
-    enum { URL_STAGE_MAIN, URL_STAGE_FETCH,
-           URL_STAGE_DONE } stage = URL_STAGE_MAIN;
-
-    memset(&ui, 0, sizeof(ui));
-
-    while (stage != URL_STAGE_DONE) {
-        switch(stage) {
-            case URL_STAGE_MAIN: {
-                /* If the stage2= parameter was given (or inferred from repo=)
-                 * then use that configuration info to fetch the image.  This
-                 * could also have come from kickstart.  Else, we need to show
-                 * the UI.
-                 */
-                if (loaderData->method == METHOD_URL && stage2Data) {
-                    urlinfo_copy(&ui, stage2Data);
-                    logMessage(INFO, "URL_STAGE_MAIN: url is %s", ui.url);
-
-                    if (!ui.url) {
-                        logMessage(ERROR, "missing URL specification");
-                        loaderData->method = -1;
-                        free(loaderData->stage2Data);
-                        loaderData->stage2Data = NULL;
-
-                        if (loaderData->inferredStage2)
-                            loaderData->invalidRepoParam = 1;
-
-                        break;
-                    }
-
-                    /* ks info was adequate, lets skip to fetching image */
-                    stage = URL_STAGE_FETCH;
-                    break;
-                } else {
-                    char *substr;
-
-                    if (urlMainSetupPanel(loaderData)) {
-                        loaderData->stage2Data = NULL;
-                        return NULL;
-                    }
-
-                    /* If the user-provided URL points at a repo instead of
-                     * a stage2 image, fix it up now.
-                     */
-                    substr = strstr(ui.url, ".img");
-                    if (!substr || (substr && *(substr+4) != '\0')) {
-                        loaderData->instRepo = strdup(ui.url);
-
-                        checked_asprintf(&ui.url, "%s/images/install.img",
-                                         ui.url);
-                    }
-
-                    loaderData->invalidRepoParam = 1;
-                }
-
-                stage = URL_STAGE_FETCH;
-                break;
-            }
-
-            case URL_STAGE_FETCH: {
-                if (loadUrlImages(loaderData)) {
-                    stage = URL_STAGE_MAIN;
-
-                    if (loaderData->method >= 0)
-                        loaderData->method = -1;
-
-                    if (loaderData->inferredStage2)
-                        loaderData->invalidRepoParam = 1;
-                } else {
-                    stage = URL_STAGE_DONE;
-                }
-
-                break;
-            }
-
-            case URL_STAGE_DONE:
-                break;
-        }
-    }
-
-    return ui.url;
-}
-
 int getFileFromUrl(char * url, char * dest, 
                    struct loaderData_s * loaderData) {
     struct iurlinfo ui;
-- 
1.7.1.1


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]