diff options
| author | Jeremy Katz <katzj@redhat.com> | 2006-02-22 20:00:32 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2006-02-22 20:00:32 +0000 |
| commit | 44eb3dd9f9488ebe6f214a328a8c55d7d3c73cf8 (patch) | |
| tree | adf919bcfc3d3dfc4d1297a350a6b7ee307aceca /loader2/lang.c | |
| parent | da4e01fa60d0b0b0844e194e8cde5d32800b56d1 (diff) | |
| download | anaconda-44eb3dd9f9488ebe6f214a328a8c55d7d3c73cf8.tar.gz anaconda-44eb3dd9f9488ebe6f214a328a8c55d7d3c73cf8.tar.xz anaconda-44eb3dd9f9488ebe6f214a328a8c55d7d3c73cf8.zip | |
2006-02-22 Jeremy Katz <katzj@redhat.com>
* lang-table: Set all previously bterm using languages to "none"
for the fact that we can't handle them in text-mode anymore
* textw/language_text.py (LanguageWindow.__call__): Remove bterm
special-casing.
* text.py (InstallInterface.run): Likewise.
* loader2/lang.c (setupLanguage): Likewise.
* language.py (Language.fixLang): No more "bterm" font
* stubs/unicode-lite.c: Don't require wlite
* stubs/Makefile: Don't link against wlite
* loader2/Makefile: No more linking to bterm here either
* isys/lang.c: Remove bterm support code.
* isys/lang.h: And declaration.
* isys/Makefile (LOADLIBES): No more linking to bterm
* isys/isys.c (start_bterm): Remove this
* anaconda.spec (BuildPreReq): Bye-bye bogl
Diffstat (limited to 'loader2/lang.c')
| -rw-r--r-- | loader2/lang.c | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/loader2/lang.c b/loader2/lang.c index b8223a14d..2e6fdb1bc 100644 --- a/loader2/lang.c +++ b/loader2/lang.c @@ -38,8 +38,6 @@ #include "../isys/lang.h" #include "../isys/isys.h" -static int startBterm(int flags); - struct aString { unsigned int hash; short length; @@ -229,9 +227,8 @@ static int setupLanguage(int choice, int flags) { 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, "bterm") && !FL_SERIAL(flags) && - !FL_VIRTPCONSOLE(flags) && !isVioConsole() && startBterm(flags)) || - !strcmp(languages[choice].font, "none")) { + if ((!strcmp(languages[choice].font, "none") && !FL_SERIAL(flags) && + !FL_VIRTPCONSOLE(flags) && !isVioConsole())) { if (FL_KICKSTART(flags)) return 0; newtWinMessage("Language Unavailable", "OK", @@ -330,19 +327,6 @@ int setLanguage (char * key, int flags) { return -1; } -static int startBterm(int flags) { - int rc; - - stopNewt(); - rc = isysStartBterm(); - - /* HACK: sleep to give the console time to adjust */ - sleep(1); - - startNewt(flags); - return rc; -} - int chooseLanguage(char ** lang, int flags) { int choice = 0; char ** langs; |