diff options
author | Chris Lumens <clumens@redhat.com> | 2007-06-29 14:33:33 +0000 |
---|---|---|
committer | Chris Lumens <clumens@redhat.com> | 2007-06-29 14:33:33 +0000 |
commit | 9adbb319558c3400099284db00e9c7385661bcef (patch) | |
tree | 3ff3c6570e2e3696064f73809aa734802381a64e | |
parent | 54df72b8e661c5606905dd0ec3bc630e9adf9475 (diff) | |
download | anaconda-9adbb319558c3400099284db00e9c7385661bcef.tar.gz anaconda-9adbb319558c3400099284db00e9c7385661bcef.tar.xz anaconda-9adbb319558c3400099284db00e9c7385661bcef.zip |
Don't display garbage in the dialog box to correct the kickstart file location
(#245936).
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | loader2/kickstart.c | 16 |
2 files changed, 17 insertions, 4 deletions
@@ -1,3 +1,8 @@ +2007-06-29 Chris Lumens <clumens@redhat.com> + + * loader2/kickstart.c (newKickstartLocation): Don't display garbage + in the dialog box to correct the kickstart file location (#245936). + 2007-06-28 Jeremy Katz <katzj@redhat.com> * anaconda.spec: Bump version. diff --git a/loader2/kickstart.c b/loader2/kickstart.c index 63fe15085..b21f77d32 100644 --- a/loader2/kickstart.c +++ b/loader2/kickstart.c @@ -351,7 +351,7 @@ void getHostandPath(char * ksSource, char **host, char ** file, char * ip) { getHostPathandLogin (ksSource, host, file, &login, &password, ip); } -static char *newKickstartLocation(char *origLocation) { +static char *newKickstartLocation(const char *origLocation) { const char *location; char *retval = NULL; newtComponent f, okay, cancel, answer, locationEntry; @@ -430,13 +430,21 @@ void getKickstartFile(struct loaderData_s *loaderData) { } if (rc != 0) { - if (loaderData->ksFile != NULL) - free(loaderData->ksFile); + char *newLocation; - loaderData->ksFile = newKickstartLocation(c); + if (!strcmp(c, "ks")) + newLocation = newKickstartLocation(""); + else + newLocation = newKickstartLocation(c); if (loaderData->ksFile != NULL) + free(loaderData->ksFile); + + if (newLocation != NULL) { + loaderData->ksFile = strdup(newLocation); + free(newLocation); return getKickstartFile(loaderData); + } else return; } |