aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2008-03-10 22:37:35 -0400
committerBill Nottingham <notting@redhat.com>2008-03-10 22:37:35 -0400
commit5d38179c29282bca01a53480ce9c5ac7cf25fbc4 (patch)
treeccdad221b44b589376a7a81ba8d528e231e16b77
parentd30faf7315a91a380760c36f198f3f684c3600d9 (diff)
downloadinitscripts-5d38179c29282bca01a53480ce9c5ac7cf25fbc4.tar
initscripts-5d38179c29282bca01a53480ce9c5ac7cf25fbc4.tar.gz
initscripts-5d38179c29282bca01a53480ce9c5ac7cf25fbc4.tar.bz2
initscripts-5d38179c29282bca01a53480ce9c5ac7cf25fbc4.tar.xz
initscripts-5d38179c29282bca01a53480ce9c5ac7cf25fbc4.zip
Add a helper that checks for serial and serial-like consoles
This works by doing checks from udev that emit upstart events. upstart listens to these events and starts a getty if needed.
-rw-r--r--Makefile3
-rw-r--r--src/Makefile3
-rw-r--r--src/console_check.c154
-rw-r--r--udev/rules.d/10-console.rules8
4 files changed, 166 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index d96f4d37..f7558bf7 100644
--- a/Makefile
+++ b/Makefile
@@ -43,7 +43,7 @@ install:
cp -af rc.d/init.d $(ROOT)/etc/rc.d/
install -m755 sysconfig/init sysconfig/netconsole sysconfig/readonly-root $(ROOT)/etc/sysconfig/
cp -af sysconfig/network-scripts $(ROOT)/etc/sysconfig/
- cp -af ppp udev NetworkManager $(ROOT)/etc
+ cp -af ppp udev NetworkManager event.d $(ROOT)/etc
mkdir -p $(ROOT)/etc/ppp/peers
chmod 755 $(ROOT)/etc/rc.d/* $(ROOT)/etc/rc.d/init.d/*
chmod 755 $(ROOT)/etc/ppp/peers
@@ -53,6 +53,7 @@ install:
chmod 755 $(ROOT)/etc/sysconfig/network-scripts/init*
chmod 755 $(ROOT)/etc/sysconfig/network-scripts/net.hotplug
chmod 755 $(ROOT)/etc/NetworkManager/dispatcher.d/00-netreport
+ chmod 644 $(ROOT)/etc/event.d/*
mkdir -p $(ROOT)/etc/sysconfig/modules
mkdir -p $(ROOT)/etc/sysconfig/networking/devices
mkdir -p $(ROOT)/etc/sysconfig/networking/profiles/default
diff --git a/src/Makefile b/src/Makefile
index 5c23a8fe..887e2373 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -2,7 +2,7 @@ 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 \
- console_init
+ console_init console_check
PPPWATCH_OBJS=ppp-watch.o shvar.o
CONSOLE_INIT_OBJS=console_init.o shvar.o
INITLOG_OBJS=initlog.o process.o
@@ -30,6 +30,7 @@ install:
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 console_check $(ROOT)/lib/udev/console_check
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
diff --git a/src/console_check.c b/src/console_check.c
new file mode 100644
index 00000000..243e9be5
--- /dev/null
+++ b/src/console_check.c
@@ -0,0 +1,154 @@
+
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <termios.h>
+#include <unistd.h>
+
+#include <sys/ioctl.h>
+
+#include <linux/serial.h>
+
+struct speeds
+{
+ speed_t speed;
+ unsigned long value;
+};
+
+struct speeds speed_map[] =
+{
+ {B50, 50},
+ {B75, 75},
+ {B110, 110},
+ {B134, 134},
+ {B150, 150},
+ {B200, 200},
+ {B300, 300},
+ {B600, 600},
+ {B1200, 1200},
+ {B1800, 1800},
+ {B2400, 2400},
+ {B4800, 4800},
+ {B9600, 9600},
+ {B19200, 19200},
+ {B38400, 38400},
+#ifdef B57600
+ {B57600, 57600},
+#endif
+#ifdef B115200
+ {B115200, 115200},
+#endif
+#ifdef B230400
+ {B230400, 230400},
+#endif
+#ifdef B460800
+ {B460800, 460800},
+#endif
+ {0, 0}
+};
+
+int termcmp(struct termios *a, struct termios *b) {
+ if (a->c_iflag != b->c_iflag || a->c_oflag != b->c_oflag ||
+ a->c_cflag != b->c_cflag || a->c_lflag != b->c_lflag ||
+ a->c_ispeed != b->c_ispeed || a->c_ospeed != b->c_ospeed)
+ return 1;
+ return memcmp(a->c_cc, b->c_cc, sizeof(a->c_cc));
+}
+
+int get_serial_speed(int fd) {
+ struct termios mode;
+
+ if (!tcgetattr(fd, &mode)) {
+ int i;
+ speed_t speed;
+
+ speed = cfgetospeed(&mode);
+ for (i = 0; speed_map[i].value != 0; i++)
+ if (speed_map[i].speed == speed)
+ return speed_map[i].value;
+ }
+ return 0;
+}
+
+int compare_termios_to_console(char *dev, int *speed) {
+ struct termios cmode, mode;
+ int fd, cfd;
+
+ cfd = open ("/dev/console", O_RDONLY);
+ tcgetattr(cfd, &cmode);
+ close(cfd);
+
+ fd = open(dev, O_RDONLY);
+ tcgetattr(fd, &mode);
+
+ if (!termcmp(&cmode, &mode)) {
+ *speed = get_serial_speed(fd);
+ close(fd);
+ return 1;
+ }
+ close(fd);
+ return 0;
+}
+
+char *check_serial_console(int *speed) {
+ int fd;
+ char *ret = NULL, *device;
+ char twelve = 12;
+ struct serial_struct si, si2;
+
+ fd = open("/dev/console", O_RDWR);
+ if (ioctl (fd, TIOCLINUX, &twelve) >= 0)
+ goto out;
+
+ if (ioctl(fd, TIOCGSERIAL, &si) < 0)
+ goto out;
+ close(fd);
+
+ asprintf(&device, "ttyS%d", si.line);
+ fd = open(device, O_RDWR|O_NONBLOCK);
+ if (fd == -1)
+ goto out;
+
+ if (ioctl(fd, TIOCGSERIAL, &si2) < 0)
+ goto out;
+
+ if (memcmp(&si,&si2, sizeof(si)))
+ goto out;
+
+ *speed = get_serial_speed(fd);
+ ret = device;
+out:
+ close(fd);
+ return ret;
+}
+
+int emit_console_event(char *dev, int speed) {
+ char *args[] = { "initctl", "emit", "--no-wait", "fedora.serial-console-available", NULL, NULL, NULL };
+
+ args[4] = dev;
+ if (speed)
+ asprintf(&args[5],"%d",speed);
+ execv("/sbin/initctl", args);
+ return 1;
+}
+
+int main(int argc, char **argv) {
+ char *device;
+ int speed;
+
+ if (argc < 2) {
+ printf("usage: console_check <device>\n");
+ exit(1);
+ }
+ chdir("/dev");
+ device = argv[1];
+ if (!strcmp(device, "console")) {
+ device = check_serial_console(&speed);
+ if (device)
+ return emit_console_event(device, speed);
+ } else if (compare_termios_to_console(device, &speed)) {
+ return emit_console_event(device, speed);
+ }
+ return 0;
+}
diff --git a/udev/rules.d/10-console.rules b/udev/rules.d/10-console.rules
index da0cfe0d..6e8c4587 100644
--- a/udev/rules.d/10-console.rules
+++ b/udev/rules.d/10-console.rules
@@ -1 +1,9 @@
+# Console initialization - keyboard, font, etc.
KERNEL=="tty0", RUN+="/lib/udev/console_init %k"
+
+# Check and set up serial and serial-like consoles if necessary
+KERNEL=="console", RUN+="/lib/udev/console_check %k"
+KERNEL=="ttySG*", RUN+="/lib/udev/console_check %k"
+KERNEL=="xvc*", RUN+="/lib/udev/console_check %k"
+KERNEL=="hvsi*", RUN+="/lib/udev/console_check %k"
+KERNEL=="hvc*", RUN+="/lib/udev/console_check %k"