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

[rhel6-branch] Do not show the lang and kbd screens again in stage2 (#706675)



If we boot from boot.iso, we ask for lang and kbd in text mode,
so it is already setup, don't ask for it again.
---
 loader/loader.c |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/loader/loader.c b/loader/loader.c
index a92aa39..33f76ad 100644
--- a/loader/loader.c
+++ b/loader/loader.c
@@ -1299,9 +1299,11 @@ 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)) {
+                skipLangKbd = 1;
+                flags |= LOADER_FLAGS_NOPASS;
+
                 setStage2LocFromCmdline(url, loaderData);
                 skipMethodDialog = 1;
 
@@ -1316,10 +1318,7 @@ static char *doLoaderMain(struct loaderData_s *loaderData,
                 umountStage2();
                 free(url);
                 url = NULL;
-                skipLangKbd = 0;
             }
-
-            flags |= LOADER_FLAGS_NOPASS;
         }
 
         if (!loaderData->stage2Data && loaderData->instRepo) {
-- 
1.7.3.2


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