Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 50fb5a69 authored by Colin Cross's avatar Colin Cross
Browse files

init: manually set controlling tty for console services 

Normally, calling open on a tty will set that tty as the process
group controlling tty if none already exists.  However, if the tty
is /dev/console, the kernel will never automatically set it as the
controlling tty.  Call the TIOCSCTTY manually on the fd, which will
always attempt to set it as the controlling tty.

Fixes ctrl-c on the console shell when androidboot.console is not
passed on the kernel command line and the default /dev/console is
used.

Change-Id: I449cc41b47e93ac38ad6987413bb54131e1ec0cd
parent 6ac770fc

init/init.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -134,6 +134,7 @@ static void open_console() 
    if ((fd = open(console_name, O_RDWR)) < 0) {

    if ((fd = open(console_name, O_RDWR)) < 0) {

        fd = open("/dev/null", O_RDWR);

        fd = open("/dev/null", O_RDWR);

    }

    }

    ioctl(fd, TIOCSCTTY, 0);

    dup2(fd, 0);

    dup2(fd, 0);

    dup2(fd, 1);

    dup2(fd, 1);

    dup2(fd, 2);

    dup2(fd, 2);