[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[rhel6-branch] Do not skip Lang and Kbd steps (#706675)



If we have just the boot.iso and no stage2,
we need to set up the keyboard before asking
the user to pick the method and location of
the stage2 image.
---
 loader/loader.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/loader/loader.c b/loader/loader.c
index aa26605..9cbcce7 100644
--- a/loader/loader.c
+++ b/loader/loader.c
@@ -1272,6 +1272,8 @@ static char *doLoaderMain(struct loaderData_s *loaderData,
              * then it's a boot.iso and we still need to prompt for the
              * installation source.
              */
+            skipLangKbd = 1;
+
             if (!access("/mnt/stage2/.discinfo", R_OK)) {
                 setStage2LocFromCmdline(url, loaderData);
                 skipMethodDialog = 1;
@@ -1287,9 +1289,9 @@ static char *doLoaderMain(struct loaderData_s *loaderData,
                 umountStage2();
                 free(url);
                 url = NULL;
+                skipLangKbd = 0;
             }
 
-            skipLangKbd = 1;
             flags |= LOADER_FLAGS_NOPASS;
         }
 
-- 
1.7.3.2


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]