-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Looks fine from a functional standpoint, but there are some whitespace
inconsistences. Comments below.
On Mon, 24 Aug 2009, Radek Vykydal wrote:
We need to clear stage2Data when going back so that
* we don't sigsegv on it later if we change nfs method to url (and also if
we change from url to nfs in case of location specified via ks or boot opts)
* we don't try to fetch stage2 from the location in stage2Data right after
reselecting the method.
Also fixes [C] and [A] from
https://www.redhat.com/archives/anaconda-devel-list/2009-August/msg00043.html
(sigsegv after going Back when incorrect stage2 url is specified via ks or boot
params) which were partly fixed by Jeremy's
ad1e95df0e277442a19f7989afe3bd758cfccb47.
---
loader/nfsinstall.c | 4 +++-
loader/urlinstall.c | 4 +++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/loader/nfsinstall.c b/loader/nfsinstall.c
index a8bba1c..964a463 100644
--- a/loader/nfsinstall.c
+++ b/loader/nfsinstall.c
@@ -159,8 +159,10 @@ char * mountNfsImage(struct installMethod * method,
} else {
char *substr, *tmp;
- if (nfsGetSetup(&host, &directory) == LOADER_BACK)
+ if (nfsGetSetup(&host, &directory) == LOADER_BACK) {
+ loaderData->stage2Data = NULL;
return NULL;
+ }
Two tabs at the beginning here.
/* If the user-provided URL points at a repo instead of a
* stage2 image, fix that up now.
diff --git a/loader/urlinstall.c b/loader/urlinstall.c
index 392dbd1..90f63cf 100644
--- a/loader/urlinstall.c
+++ b/loader/urlinstall.c
@@ -223,8 +223,10 @@ char *mountUrlImage(struct installMethod *method, char *location,
} else {
char *substr;
- if (urlMainSetupPanel(&ui))
+ if (urlMainSetupPanel(&ui)) {
+ loaderData->stage2Data = NULL;
return NULL;
+ }
Two tabs at the beginning here here followed by four spaces.
/* If the user-provided URL points at a repo instead of
* a stage2 image, fix it up now.
- --
David Cantrell <dcantrell@xxxxxxxxxx>
Red Hat / Honolulu, HI
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
iEYEARECAAYFAkqTG6wACgkQ5hsjjIy1VkkTWgCgzJovrkcNtf8TC04B07gDEs6l
ArsAniAqKzECszONRoL0KyU2CeBh5iee
=pWsK
-----END PGP SIGNATURE-----
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
