diff options
author | Chris Lumens <clumens@redhat.com> | 2011-10-24 11:02:35 -0400 |
---|---|---|
committer | Chris Lumens <clumens@redhat.com> | 2011-10-31 14:58:13 -0400 |
commit | 622a7a6f720b39455763052e80f4fada34ce328c (patch) | |
tree | 2a61bbadc8308fdd184fb0748055a3ac839e1bbf /pyanaconda/isys | |
parent | 21d1951748b6ba76b656ee8eebb4446e28928716 (diff) | |
download | anaconda-622a7a6f720b39455763052e80f4fada34ce328c.tar.gz anaconda-622a7a6f720b39455763052e80f4fada34ce328c.tar.xz anaconda-622a7a6f720b39455763052e80f4fada34ce328c.zip |
And stop attempting to load our own fonts, since we no longer ship them.
Diffstat (limited to 'pyanaconda/isys')
-rw-r--r-- | pyanaconda/isys/lang.c | 41 | ||||
-rw-r--r-- | pyanaconda/isys/lang.h | 1 |
2 files changed, 0 insertions, 42 deletions
diff --git a/pyanaconda/isys/lang.c b/pyanaconda/isys/lang.c index 0fa3d3c4d..07dee56ff 100644 --- a/pyanaconda/isys/lang.c +++ b/pyanaconda/isys/lang.c @@ -40,47 +40,6 @@ #include "isys.h" #include "lang.h" -int isysLoadFont(void) { - unsigned char font[65536]; - struct console_font_op cfo; - unsigned short map[E_TABSZ]; - struct unimapdesc d; - struct unimapinit u; - struct unipair desc[2048]; - gzFile stream; - int rc; - -#if defined (__s390__) || defined (__s390x__) - return 0; -#endif - stream = gzopen("/etc/screenfont.gz", "r"); - if (!stream) - return -EACCES; - - gzread(stream, &cfo, sizeof(cfo)); - gzread(stream, font, sizeof(font)); - gzread(stream, map, sizeof(map)); - gzread(stream, &d.entry_ct, sizeof(d.entry_ct)); - d.entries = desc; - gzread(stream, desc, d.entry_ct * sizeof(desc[0])); - gzclose(stream); - - cfo.data = font; - cfo.op = KD_FONT_OP_SET; - - rc = ioctl(1, KDFONTOP, &cfo); - if (rc) return rc; - rc = ioctl(1, PIO_UNIMAPCLR, &u); - if (rc) return rc; - rc = ioctl(1, PIO_UNIMAP, &d); - if (rc) return rc; - rc = ioctl(1, PIO_UNISCRNMAP, map); - if (rc) return rc; - /* activate the font map */ - fprintf(stderr, "\033(K"); - return 0; -} - int isysSetUnicodeKeymap(void) { int console; diff --git a/pyanaconda/isys/lang.h b/pyanaconda/isys/lang.h index a83778a53..b5ff4da45 100644 --- a/pyanaconda/isys/lang.h +++ b/pyanaconda/isys/lang.h @@ -37,7 +37,6 @@ struct kmapInfo { }; int loadKeymap(gzFile stream); -int isysLoadFont(void); int isysLoadKeymap(char * keymap); int isysSetUnicodeKeymap(void); |