diff options
| author | David Cantrell <dcantrell@redhat.com> | 2006-07-26 21:27:11 +0000 |
|---|---|---|
| committer | David Cantrell <dcantrell@redhat.com> | 2006-07-26 21:27:11 +0000 |
| commit | af9c49fa0485c76ebeb0b2dd560effccd3821751 (patch) | |
| tree | fcac21399ac629cff537b38fb4d67e1c0f48ebe9 /loader2/method.c | |
| parent | af6c15155a36f2ee5eace7fa88c2ec2daa8c9e16 (diff) | |
* loader2/urls.c (urlinstStartTransfer): Determine address family
and pass that to the ftpOpen() call.
* urlinstall.py (UrlInstallMethod.__init__): Use urlparse.
* isys/dns.c, isys/dns.h: Updated for IPv6 support.
* loader2/Makefile: Cleanups.
* loader2/ftp.c, loader2/ftp.h: Updated for IPv6 support.
* loader2/loader.c: Whitespace consistency.
* loader2/method.c: Whitespace consistency.
* loader2/urls.c: Updated for IPv6 support.
Diffstat (limited to 'loader2/method.c')
| -rw-r--r-- | loader2/method.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/loader2/method.c b/loader2/method.c index a507f67a6..47e070485 100644 --- a/loader2/method.c +++ b/loader2/method.c @@ -690,7 +690,7 @@ void setMethodFromCmdline(char * arg, struct loaderData_s * ld) { c = strtok(NULL, ":"); if (!strncmp(arg, "nfs:", 4)) { - ld->method = strdup("nfs"); + ld->method = strdup("nfs"); ld->methodData = calloc(sizeof(struct nfsInstallData *), 1); ((struct nfsInstallData *)ld->methodData)->host = strdup(c); if ((c = strtok(NULL, ":"))) { @@ -698,14 +698,14 @@ void setMethodFromCmdline(char * arg, struct loaderData_s * ld) { } } else if (!strncmp(arg, "ftp:", 4) || !strncmp(arg, "http:", 5)) { - ld->method = strcmp(arg, "ftp") ? strdup("ftp") : strdup("http"); + ld->method = strcmp(arg, "ftp") ? strdup("ftp") : strdup("http"); ld->methodData = calloc(sizeof(struct urlInstallData *), 1); ((struct urlInstallData *)ld->methodData)->url = strdup(arg); } else if (!strncmp(arg, "cdrom:", 6)) { - ld->method = strdup("cdrom"); + ld->method = strdup("cdrom"); } else if (!strncmp(arg, "harddrive:", 10) || !strncmp(arg, "hd:", 3)) { - ld->method = strdup("hd"); + ld->method = strdup("hd"); ld->methodData = calloc(sizeof(struct hdInstallData *), 1); ((struct hdInstallData *)ld->methodData)->partition = strdup(c); if ((c = strtok(NULL, ":"))) { @@ -714,5 +714,4 @@ void setMethodFromCmdline(char * arg, struct loaderData_s * ld) { } } free(dup); - } |