summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Katz <katzj@redhat.com>2003-02-11 05:27:00 +0000
committerJeremy Katz <katzj@redhat.com>2003-02-11 05:27:00 +0000
commitcb033795b9da5ec786d2bffcda7cfe19982f94e2 (patch)
tree0b80df8ba992dbdb6930ab92c594c5991d1accf0
parent6864f96ac5f5c75bf4a0b1bd66c066385af0f4ca (diff)
downloadanaconda-cb033795b9da5ec786d2bffcda7cfe19982f94e2.tar.gz
anaconda-cb033795b9da5ec786d2bffcda7cfe19982f94e2.tar.xz
anaconda-cb033795b9da5ec786d2bffcda7cfe19982f94e2.zip
no need to duplicate code, just use what's in isys
-rw-r--r--loader2/lang.c18
1 files changed, 2 insertions, 16 deletions
diff --git a/loader2/lang.c b/loader2/lang.c
index fe554607b..ee1ef1042 100644
--- a/loader2/lang.c
+++ b/loader2/lang.c
@@ -35,6 +35,7 @@
#include "../isys/stubs.h"
#include "../isys/cpio.h"
+#include "../isys/lang.h"
static int startBterm(int flags);
@@ -322,26 +323,11 @@ int setLanguage (char * key, int flags) {
return -1;
}
-/* returns 0 on success, 1 on failure */
-extern int bterm_main(int argc, char **argv);
-
static int startBterm(int flags) {
- char *args[4] = { "bterm", "-s", "-f", NULL };
int rc;
- struct stat sb;
-
- /* assume that if we're already on a pty we can handle unicode */
- fstat(0, &sb);
- if (major(sb.st_rdev) == 3 || major(sb.st_rdev) == 136)
- return 0;
- if (FL_TESTING(flags))
- args[3] = "font.bgf.gz";
- else
- args[3] = "/etc/font.bgf.gz";
-
stopNewt();
- rc = bterm_main(4, args);
+ rc = isysStartBterm();
/* HACK: sleep to give the console time to adjust */
sleep(1);