From e1e49f90e89e507d6917092ac88602641d696e7a Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Tue, 26 Feb 2008 01:31:47 -0500 Subject: Add console_init udev helper. This helper: - sets the keyboard mode - sets the console mode - sets the console font - sets the keyboard map based on configuration in /etc/sysconfig/keyboard and /etc/sysconfig/i18n. This allows us to remove various cruft from rc.sysinit and /etc/profile.d/lang.sh. --- initscripts.spec | 1 + src/Makefile | 11 +++- src/console_init.c | 159 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 170 insertions(+), 1 deletion(-) create mode 100644 src/console_init.c diff --git a/initscripts.spec b/initscripts.spec index b74dec2e..e32b518b 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -187,6 +187,7 @@ rm -rf $RPM_BUILD_ROOT %attr(2755,root,root) /sbin/netreport /sbin/initlog /lib/udev/rename_device +/lib/udev/console_init %ifarch s390 s390x /lib/udev/ccw_init %endif diff --git a/src/Makefile b/src/Makefile index df4f6bd4..5c23a8fe 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,8 +1,10 @@ CFLAGS+=$(RPM_OPT_FLAGS) -Wall -D_GNU_SOURCE PROGS=usernetctl doexec netreport testd usleep ipcalc initlog \ - fstab-decode getkey ppp-watch consoletype genhostid rename_device + fstab-decode getkey ppp-watch consoletype genhostid rename_device \ + console_init PPPWATCH_OBJS=ppp-watch.o shvar.o +CONSOLE_INIT_OBJS=console_init.o shvar.o INITLOG_OBJS=initlog.o process.o USLEEP_OBJS=usleep.o @@ -27,6 +29,7 @@ install: install -m 755 ppp-watch $(ROOT)/sbin/ppp-watch install -m 755 consoletype $(ROOT)/sbin/consoletype install -m 755 rename_device $(ROOT)/lib/udev/rename_device + install -m 755 console_init $(ROOT)/lib/udev/console_init install -m 755 ccw_init $(ROOT)/lib/udev/ccw_init install -m 644 initlog.1 $(ROOT)$(mandir)/man1 install -m 644 genhostid.1 $(ROOT)$(mandir)/man1 @@ -79,3 +82,9 @@ rename_device: rename_device.c kmodule: kmodule.o $(CC) $(LDFLAGS) -o $@ $< -lpopt -lkudzu -lpci + +console_init.o: console_init.c + $(CC) $(CFLAGS) `pkg-config glib-2.0 --cflags` -c console_init.c -o console_init.o + +console_init: $(CONSOLE_INIT_OBJS) + $(CC) $(LDFLAGS) -o $@ $(CONSOLE_INIT_OBJS) `pkg-config glib-2.0 --libs` diff --git a/src/console_init.c b/src/console_init.c new file mode 100644 index 00000000..ddab86c8 --- /dev/null +++ b/src/console_init.c @@ -0,0 +1,159 @@ +/* + * Copyright (c) 2008 Red Hat, Inc. All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License, version 2, + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * + */ + +#include +#include +#include +#include + +#include +#include +#include +#include + +#include + +#include "shvar.h" + +static char *lang = NULL; +static char *font = NULL; +static char *acm = NULL; +static char *keymap = NULL; + +static int linux_console(int fd) { + unsigned char twelve = 12; + + if (ioctl(fd, TIOCLINUX, &twelve) >= 0) + return 1; + return 0; +} + +static int configured_as_utf8() { + shvarFile *i18nfile = NULL; + + if ((i18nfile = svNewFile("/etc/sysconfig/i18n")) == NULL) + return 1; /* assume UTF-8 */ + + lang = svGetValue(i18nfile, "LANG"); + font = svGetValue(i18nfile, "SYSFONT"); + acm = svGetValue(i18nfile, "SYSFONTACM"); + svCloseFile(i18nfile); + if (!lang) + return 1; + if (g_str_has_suffix(lang,".utf8") || g_str_has_suffix(lang,".UTF-8")) + return 1; + return 0; +} + +static int read_keymap() { + shvarFile *keyboard = NULL; + char *tmp; + struct stat sb; + + if (!stat("/etc/sysconfig/console/default.kmap",&sb)) { + keymap = "/etc/sysconfig/console/default.kmap"; + return 0; + } + + if ((keyboard = svNewFile("/etc/sysconfig/keyboard")) == NULL) + return 0; + + tmp = svGetValue(keyboard, "KEYMAP"); + if (tmp) + keymap = tmp; + tmp = svGetValue(keyboard, "KEYTABLE"); + if (tmp) { + if (keymap) free(keymap); + asprintf(&keymap, "%s.map", tmp); + } + return 0; +} + +static void set_font(int fd) { + int pid, status; + + if ( (pid = fork()) == 0) { + char *args[] = { "setfont", "latarcyrheb-sun16", NULL, NULL, NULL }; + + if (font) + args[1] = font; + if (acm) { + args[2] = "-u"; + args[3] = acm; + } + execv("/bin/setfont", args); + exit(1); + } + waitpid(pid, &status, 0); +} + +static void set_keyboard(int fd, int utf8) { + if (ioctl(fd, KDSKBMODE, utf8 ? K_UNICODE : K_XLATE)) + perror("could not set keyboard mode"); +} + +static void set_terminal(int fd, int utf8) { + if (utf8) + write(fd, "\033%G", 3); + else + write(fd, "\033%@", 3); +} + +static void set_keymap(int fd, int utf8) { + int pid, status; + + if ((pid = fork()) == 0) { + char *args[] = { "loadkeys", NULL, NULL, NULL }; + dup2(fd, 0); + dup2(fd, 1); + + if (utf8) { + args[1] = "-u"; + args[2] = keymap; + } else { + args[1] = keymap; + } + execv("/bin/loadkeys", args); + exit(1); + } + waitpid(pid, &status, 0); +} + +int main(int argc, char **argv) { + char *device; + int dev; + + if (argc < 2) { + printf("usage: console_init \n"); + exit(1); + } + chdir("/dev"); + device = argv[1]; + dev = open(device, O_RDWR); + if (linux_console(dev)) { + int utf8 = configured_as_utf8(); + + set_keyboard(dev, utf8); + set_terminal(dev, utf8); + set_font(dev); + read_keymap(); + if (keymap) + set_keymap(dev,utf8); + } + return 0; +} -- cgit v1.2.1