summaryrefslogtreecommitdiffstats
path: root/isys/lang.c
diff options
context:
space:
mode:
authorJeremy Katz <katzj@redhat.com>2003-03-21 00:09:53 +0000
committerJeremy Katz <katzj@redhat.com>2003-03-21 00:09:53 +0000
commitc29f0955045cdd02965a14300ce5e99364db2d1b (patch)
treed84a948b5288d9b0b9bd28649f608b8df9f18ea0 /isys/lang.c
parent720f69db5a6df4a3d6afe90ea228b5a90fe41333 (diff)
downloadanaconda-c29f0955045cdd02965a14300ce5e99364db2d1b.tar.gz
anaconda-c29f0955045cdd02965a14300ce5e99364db2d1b.tar.xz
anaconda-c29f0955045cdd02965a14300ce5e99364db2d1b.zip
merge taroon branch up until now. tagged as before-taroon-merge before and
will be tagged after-taroon-merge after. taroon at this point is tagged taroon-merge-point for where to base merges from in the future
Diffstat (limited to 'isys/lang.c')
-rw-r--r--isys/lang.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/isys/lang.c b/isys/lang.c
index 74e09a53c..684ae2247 100644
--- a/isys/lang.c
+++ b/isys/lang.c
@@ -25,6 +25,9 @@ int isysLoadFont(void) {
gzFile stream;
int rc;
+#if defined (__s390__) || defined (__s390x__)
+ return 0;
+#endif
stream = gunzip_open("/etc/screenfont.gz");
if (!stream)
return -EACCES;
@@ -56,6 +59,9 @@ int isysLoadFont(void) {
int isysSetUnicodeKeymap(void) {
int console;
+#if defined (__s390__) || defined (__s390x__)
+ return 0;
+#endif
console = open("/dev/console", O_RDWR);
if (console < 0)
return -EACCES;
@@ -76,6 +82,9 @@ int loadKeymap(gzFile stream) {
int magic;
short keymap[NR_KEYS];
+#if defined (__s390__) || defined (__s390x__)
+ return 0;
+#endif
if (gunzip_read(stream, &magic, sizeof(magic)) != sizeof(magic))
return -EIO;