[PATCH] Fix going back from hd install UI when stage2 is given as boot param (#519206).

[Radek Vykydal <rvykydal@xxxxxxxxxx>]

Prevents SIGSEGV.
We need to reinitialize stage2Data here too (as for other methods).  Also when
going back from Driver Disk Source dialog - go back to hd install dialog
instead of going straight to install method dialog.
---
 loader/hdinstall.c |    8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/loader/hdinstall.c b/loader/hdinstall.c
index 46f604e..0baae20 100644
--- a/loader/hdinstall.c
+++ b/loader/hdinstall.c
@@ -224,12 +224,10 @@ char * mountHardDrive(struct installMethod * method,
                                  "your system! Would you like to configure "
                                  "additional devices?"));
             if (rc == 2)
+                loaderData->stage2Data = NULL;
                 return NULL;
 
             rc = loadDriverFromMedia(DEVICE_DISK, loaderData, 0, 0);
-            if (rc == LOADER_BACK)
-                return NULL;
-
             continue;
         }
 
@@ -314,12 +312,10 @@ char * mountHardDrive(struct installMethod * method,
         newtPopWindow();
 
         if (es.reason == NEWT_EXIT_COMPONENT && es.u.co == back) {
+            loaderData->stage2Data = NULL;
             return NULL;
         } else if (es.reason == NEWT_EXIT_HOTKEY && es.u.key == NEWT_KEY_F2) {
             rc = loadDriverFromMedia(DEVICE_DISK, loaderData, 0, 0);
-            if (rc == LOADER_BACK)
-                return NULL;
-
             continue;
         }
 
-- 
1.6.0.6

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list