From 56c6c3a0a94a1a66f8d169aa3fc46e2fbb3310f3 Mon Sep 17 00:00:00 2001 From: Daniel Hiltgen Date: Thu, 16 Jun 2016 17:11:26 -0700 Subject: [PATCH] Add support for console on tty1 When running moby under other hypervisors, requiring troubleshooting on the serial port can be painful. This change enables console support on tty1 similar to the way prior boot2docker images worked. --- alpine/etc/securetty | 1 + alpine/inittab.x86_64 | 3 +++ alpine/isolinux.cfg | 2 +- alpine/kernel/kernel_config | 7 ++++--- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/alpine/etc/securetty b/alpine/etc/securetty index 4febc1aa9..a04e4f2a6 100644 --- a/alpine/etc/securetty +++ b/alpine/etc/securetty @@ -1,3 +1,4 @@ console ttyS0 ttyAMA0 +tty1 diff --git a/alpine/inittab.x86_64 b/alpine/inittab.x86_64 index 7b447a309..ba4999ea5 100644 --- a/alpine/inittab.x86_64 +++ b/alpine/inittab.x86_64 @@ -7,6 +7,9 @@ # Put a getty on the serial port ttyS0::respawn:/sbin/getty -L ttyS0 115200 vt100 +# Put a getty on the console +tty1::respawn:/sbin/getty 115200 tty1 linux + # Stuff to do for the 3-finger salute ::ctrlaltdel:/sbin/reboot diff --git a/alpine/isolinux.cfg b/alpine/isolinux.cfg index 5a15eb15c..499bdfce7 100644 --- a/alpine/isolinux.cfg +++ b/alpine/isolinux.cfg @@ -2,4 +2,4 @@ DEFAULT linux LABEL linux KERNEL /vmlinuz64 INITRD /initrd.img - APPEND earlyprintk=serial console=ttyS0 \ No newline at end of file + APPEND earlyprintk=serial console=ttyS0 console=tty0 diff --git a/alpine/kernel/kernel_config b/alpine/kernel/kernel_config index 7b19c713a..d118066b2 100644 --- a/alpine/kernel/kernel_config +++ b/alpine/kernel/kernel_config @@ -1753,7 +1753,8 @@ CONFIG_INPUT_EVDEV=y # # Input Device Drivers # -# CONFIG_INPUT_KEYBOARD is not set +CONFIG_INPUT_KEYBOARD=y +CONFIG_KEYBOARD_ATKBD=y # CONFIG_INPUT_MOUSE is not set # CONFIG_INPUT_JOYSTICK is not set # CONFIG_INPUT_TABLET is not set @@ -1780,7 +1781,7 @@ CONFIG_INPUT_XEN_KBDDEV_FRONTEND=y # CONFIG_SERIO=y CONFIG_ARCH_MIGHT_HAVE_PC_SERIO=y -# CONFIG_SERIO_I8042 is not set +CONFIG_SERIO_I8042=y CONFIG_SERIO_SERPORT=y # CONFIG_SERIO_CT82C710 is not set CONFIG_SERIO_PCIPS2=y @@ -2367,7 +2368,7 @@ CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y # # HID support # -# CONFIG_HID is not set +CONFIG_HID=y # # I2C HID support