Linux Archive

Linux Archive (http://www.linux-archive.org/)
-   Debian User (http://www.linux-archive.org/debian-user/)
-   -   Initialize locale before the kickstart/virtio check (#679702) (http://www.linux-archive.org/debian-user/495714-initialize-locale-before-kickstart-virtio-check-679702-a.html)

Martin Sivak 03-01-2011 11:06 AM

Initialize locale before the kickstart/virtio check (#679702)
 
---
loader/lang.c | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/loader/lang.c b/loader/lang.c
index 651c1a0..4caaeeb 100644
--- a/loader/lang.c
+++ b/loader/lang.c
@@ -237,20 +237,6 @@ static int setupLanguage(int choice, int forced) {
pid_t localedef_pid;

logMessage(DEBUGLVL, "going to set language to %s", languages[choice].lc_all);
- /* load the language only if it is displayable. if they're using
- * a serial console or iSeries vioconsole, we hope it's smart enough */
- if ((strcmp(languages[choice].font, "latarcyrheb-sun16") && !FL_SERIAL(flags) &&
- !FL_VIRTPCONSOLE(flags) && !isVioConsole())) {
- if (forced == 1) return 0;
-
- newtWinMessage("Language Unavailable", "OK",
- "%s display is unavailable in text mode. The "
- "installation will continue in English until the "
- "display of %s is possible.", languages[choice].lang,
- languages[choice].lang);
- setLangEnv(english);
- return 0;
- }

/* Parse locale parts out of locale name.

@@ -316,6 +302,21 @@ static int setupLanguage(int choice, int forced) {
if (locale_mod) free(locale_mod);
if (locale_p) free(locale_p);

+ /* load the language only if it is displayable. if they're using
+ * a serial console or iSeries vioconsole, we hope it's smart enough */
+ if ((strcmp(languages[choice].font, "latarcyrheb-sun16") && !FL_SERIAL(flags) &&
+ !FL_VIRTPCONSOLE(flags) && !isVioConsole())) {
+ if (forced == 1) return 0;
+
+ newtWinMessage("Language Unavailable", "OK",
+ "%s display is unavailable in text mode. The "
+ "installation will continue in English until the "
+ "display of %s is possible.", languages[choice].lang,
+ languages[choice].lang);
+ setLangEnv(english);
+ return 0;
+ }
+
setLangEnv (choice);
isysLoadFont();

@@ -335,7 +336,6 @@ static int setupLanguage(int choice, int forced) {
newtPushHelpLine(_(bottomHelpLine));

return 0;
-
}

/* this is pretty simple. we want to break down the language specifier
--
1.7.4

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


All times are GMT. The time now is 03:05 PM.

VBulletin, Copyright ©2000 - 2014, Jelsoft Enterprises Ltd.
Content Relevant URLs by vBSEO ©2007, Crawlability, Inc.