summaryrefslogtreecommitdiffstats
path: root/loader/urlinstall.c
diff options
context:
space:
mode:
authorRadek Vykydal <rvykydal@redhat.com>2009-08-26 14:24:14 +0200
committerRadek Vykydal <rvykydal@redhat.com>2009-08-26 14:24:14 +0200
commitcdc39d39f2a6696bea6a49780980975820663c1e (patch)
treeb02b52a98ad3e015467c23da7bf960475ed97086 /loader/urlinstall.c
parent898a891c001871ab4faafd38a0bf980f8e8d53a6 (diff)
downloadanaconda-cdc39d39f2a6696bea6a49780980975820663c1e.tar.gz
anaconda-cdc39d39f2a6696bea6a49780980975820663c1e.tar.xz
anaconda-cdc39d39f2a6696bea6a49780980975820663c1e.zip
Fix going back from stage1 nfs/url setup dialog.
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.
Diffstat (limited to 'loader/urlinstall.c')
-rw-r--r--loader/urlinstall.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/loader/urlinstall.c b/loader/urlinstall.c
index 392dbd1a4..150800e48 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;
+ }
/* If the user-provided URL points at a repo instead of
* a stage2 image, fix it up now.