summaryrefslogtreecommitdiffstats
path: root/loader2
diff options
context:
space:
mode:
authorChris Lumens <clumens@redhat.com>2007-06-29 14:33:33 +0000
committerChris Lumens <clumens@redhat.com>2007-06-29 14:33:33 +0000
commit9adbb319558c3400099284db00e9c7385661bcef (patch)
tree3ff3c6570e2e3696064f73809aa734802381a64e /loader2
parent54df72b8e661c5606905dd0ec3bc630e9adf9475 (diff)
downloadanaconda-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).
Diffstat (limited to 'loader2')
-rw-r--r--loader2/kickstart.c16
1 files changed, 12 insertions, 4 deletions
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;
}