FAQ Search Today's Posts Mark Forums Read
» Video Reviews

» Linux Archive

Linux-archive is a website aiming to archive linux email lists and to make them easily accessible for linux users/developers.


» Sponsor

» Partners

» Sponsor

Go Back   Linux Archive > ArchLinux > ArchLinux Development

 
 
LinkBack Thread Tools
 
Old 10-31-2011, 01:53 PM
Chris Lumens
 
Default And stop attempting to load our own fonts, since we no longer ship them.

---
loader/lang.c | 1 -
loader/loader.c | 1 -
pyanaconda/isys/lang.c | 41 -----------------------------------------
pyanaconda/isys/lang.h | 1 -
4 files changed, 0 insertions(+), 44 deletions(-)

diff --git a/loader/lang.c b/loader/lang.c
index a11de14..0c66d90 100644
--- a/loader/lang.c
+++ b/loader/lang.c
@@ -341,7 +341,6 @@ static int setupLanguage(int choice, int forced) {
}

setLangEnv (choice);
- isysLoadFont();

/* clear out top line */
buf = alloca(81); /* reserve one byte for */
diff --git a/loader/loader.c b/loader/loader.c
index 30a8f0e..ab281a9 100644
--- a/loader/loader.c
+++ b/loader/loader.c
@@ -337,7 +337,6 @@ void initializeConsole() {
printf("33%%G");
fflush(stdout);

- isysLoadFont();
isysSetUnicodeKeymap();
}

diff --git a/pyanaconda/isys/lang.c b/pyanaconda/isys/lang.c
index 0fa3d3c..07dee56 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, "33(K");
- return 0;
-}
-
int isysSetUnicodeKeymap(void) {
int console;

diff --git a/pyanaconda/isys/lang.h b/pyanaconda/isys/lang.h
index a83778a..b5ff4da 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);

--
1.7.6

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@redhat.com
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
 

Thread Tools




All times are GMT. The time now is 09:53 AM.

VBulletin, Copyright ©2000 - 2014, Jelsoft Enterprises Ltd.
Content Relevant URLs by vBSEO ©2007, Crawlability, Inc.
Copyright 2007 - 2008, www.linux-archive.org