From cdc39d39f2a6696bea6a49780980975820663c1e Mon Sep 17 00:00:00 2001 From: Radek Vykydal Date: Wed, 26 Aug 2009 14:24:14 +0200 Subject: 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. --- loader/urlinstall.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'loader/urlinstall.c') 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. -- cgit