From 3f3ca5579119176a7efe3cfdd76b3a4200cc76b6 Mon Sep 17 00:00:00 2001 From: Jeremy Katz Date: Wed, 12 Feb 2003 00:42:30 +0000 Subject: don't start bterm for serial installs. we can then get pretty serial cjk installs --- loader2/lang.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/loader2/lang.c b/loader2/lang.c index ee1ef1042..2b90e329b 100644 --- a/loader2/lang.c +++ b/loader2/lang.c @@ -227,8 +227,10 @@ static int setupLanguage(int choice, int flags) { int i; logMessage("going to set language to %s", languages[choice].lc_all); - /* load the language only if it is displayable */ - if (!strcmp(languages[choice].font, "bterm") && startBterm(flags)) { + /* load the language only if it is displayable. if they're using + * a serial console, we hope it's smart enough */ + if (!strcmp(languages[choice].font, "bterm") && !FL_SERIAL(flags) && + startBterm(flags)) { if (FL_KICKSTART(flags)) return 0; newtWinMessage("Language Unavailable", "OK", @@ -384,8 +386,10 @@ int chooseLanguage(char ** lang, int flags) { /* this can't happen */ if (i == numLanguages) abort(); - /* load the language only if it is displayable */ - if (!strcmp(languages[choice].font, "bterm") && startBterm(flags)) { + /* load the language only if it is displayable. assume that if they're + * on a serial console that their terminal is smart. */ + if (!strcmp(languages[choice].font, "bterm") && !FL_SERIAL(flags) && + startBterm(flags)) { newtWinMessage("Language Unavailable", "OK", "%s display is unavailable in text mode. The " "installation will continue in English until the " -- cgit