d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix the staircase issue properly this time.

Browse Source 
Even though I thought this bug was somewhere in the TTY layer, it turns
out init(8) doesn't make sure /dev/console is opened initially properly.
I've added revoke() to two pieces of code:

- death(): Apart from killing the gettys on shutdown, this doesn't
  guarantee the TTY to be closed immediately.
- runshutdown(): Just like setctty(), we should revoke /dev/console.
  Applications like syslogd may have file descriptors to the console.
This commit is contained in:
Ed Schouten 2009-06-14 17:00:35 +00:00
parent e49d35049d
commit 4ae35b5d2a
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=194198
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sbin/init/init.c
View File

@ -1495,9 +1495,16 @@ death(void)
/* NB: should send a message to the session logger to avoid blocking. */
logwtmp("~", "shutdown", "");
/*
* Also revoke the TTY here. Because runshutdown() may reopen
* the TTY whose getty we're killing here, there is no guarantee
* runshutdown() will perform the initial open() call, causing
* the terminal attributes to be misconfigured.
*/
for (sp = sessions; sp; sp = sp->se_next) {
sp->se_flags |= SE_SHUTDOWN;
kill(sp->se_process, SIGHUP);
revoke(sp->se_device);
}
/* Try to run the rc.shutdown script within a period of time */
@ -1566,6 +1573,7 @@ runshutdown(void)
sigaction(SIGTSTP, &sa, (struct sigaction *)0);
sigaction(SIGHUP, &sa, (struct sigaction *)0);
revoke(_PATH_CONSOLE);
if ((fd = open(_PATH_CONSOLE, O_RDWR)) == -1)
warning("can't open %s: %m", _PATH_CONSOLE);
else {