Chris Lumens wrote:
What happens if I boot with:
linux ks=http://wherever/whatever.ks stage2=http://wherever/install.img
If I read the code correctly (in my patched test builds NM can't set up
the network so
I can test it probably only with ks on media) the problem with the patch
is that
in case when ks url command value *isn't* stage2 location (doesn't end
with ".img"),
inferred value will override stage2= parameter which is incorrect change
of behaviour I guess.
Attached patch should be better in this respect.
Radek
>From ff6e1471131b3f14c1d1b0e2d12a78c16dd0871c Mon Sep 17 00:00:00 2001
From: Radek Vykydal <rvykydal@xxxxxxxxxx>
Date: Tue, 29 Sep 2009 13:22:21 +0200
Subject: [PATCH] Fix a segfault when stage2= boot parameter and kickstart url method is used (#524417).
Concerns cases when stage2= can't be parsed as http or ftp url.
---
loader/urlinstall.c | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/loader/urlinstall.c b/loader/urlinstall.c
index 150800e..57b9bc2 100644
--- a/loader/urlinstall.c
+++ b/loader/urlinstall.c
@@ -463,9 +463,7 @@ void setKickstartUrl(struct loaderData_s * loaderData, int argc,
}
/* determine install type */
- if (strstr(url, "http://";) || strstr(url, "ftp://";))
- loaderData->method = METHOD_URL;
- else {
+ if (!strstr(url, "http://";) && !strstr(url, "ftp://";)) {
newtWinMessage(_("Kickstart Error"), _("OK"),
_("Unknown Url method %s"), url);
return;
@@ -479,6 +477,7 @@ void setKickstartUrl(struct loaderData_s * loaderData, int argc,
return;
((struct urlInstallData *)loaderData->stage2Data)->url = url;
+ loaderData->method = METHOD_URL;
}
logMessage(INFO, "results of url ks, url %s", url);
--
1.6.0.6
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
