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

Bring in my changes from the 1.1 init.bsdi which causes a reboot (was a

Browse Source 
halt before)  if init is sent an interrupt signal.  This is necessary
for <CTL><ALT><DEL> to do the right thing if enabled.
This commit is contained in:
Nate Williams 1994-08-27 21:32:01 +00:00
parent 3b281f5345
commit e460cfd33f
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=2323
2 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sbin/init/init.8
View File

@ -229,6 +229,15 @@ This hook is used by
and and
.Xr halt 8 . .Xr halt 8 .
.Pp .Pp
.Nm Init
will terminate all possible processes (again, it will not wait
for deadlocked processes) and reboot the machine if sent the interrupt
.Pq Dv INT
signal, i.e.
.Dq Li "kill \-INT 1".
This is useful for shutting the machine down cleanly from inside the kernel
or from X when the machines appears to be hung.
.Pp
The role of The role of
.Nm init .Nm init
is so critical that if it dies, the system will reboot itself is so critical that if it dies, the system will reboot itself

17
sbin/init/init.c
View File

@ -59,6 +59,7 @@ static char sccsid[] = "@(#)init.c 8.1 (Berkeley) 7/15/93";
#include <time.h> #include <time.h>
#include <ttyent.h> #include <ttyent.h>
#include <unistd.h> #include <unistd.h>
#include <sys/reboot.h>
#ifdef __STDC__ #ifdef __STDC__
#include <stdarg.h> #include <stdarg.h>
@ -114,6 +115,7 @@ state_func_t catatonia __P((void));
state_func_t death __P((void)); state_func_t death __P((void));
enum { AUTOBOOT, FASTBOOT } runcom_mode = AUTOBOOT; enum { AUTOBOOT, FASTBOOT } runcom_mode = AUTOBOOT;
int reboot = FALSE;
void transition __P((state_t)); void transition __P((state_t));
state_t requested_transition = runcom; state_t requested_transition = runcom;
@ -229,11 +231,11 @@ main(argc, argv)
handle(badsys, SIGSYS, 0); handle(badsys, SIGSYS, 0);
handle(disaster, SIGABRT, SIGFPE, SIGILL, SIGSEGV, handle(disaster, SIGABRT, SIGFPE, SIGILL, SIGSEGV,
SIGBUS, SIGXCPU, SIGXFSZ, 0); SIGBUS, SIGXCPU, SIGXFSZ, 0);
handle(transition_handler, SIGHUP, SIGTERM, SIGTSTP, 0); handle(transition_handler, SIGHUP, SIGINT, SIGTERM, SIGTSTP, 0);
handle(alrm_handler, SIGALRM, 0); handle(alrm_handler, SIGALRM, 0);
sigfillset(&mask); sigfillset(&mask);
delset(&mask, SIGABRT, SIGFPE, SIGILL, SIGSEGV, SIGBUS, SIGSYS, delset(&mask, SIGABRT, SIGFPE, SIGILL, SIGSEGV, SIGBUS, SIGSYS,
SIGXCPU, SIGXFSZ, SIGHUP, SIGTERM, SIGTSTP, SIGALRM, 0); SIGXCPU, SIGXFSZ, SIGHUP, SIGINT, SIGTERM, SIGTSTP, SIGALRM, 0);
sigprocmask(SIG_SETMASK, &mask, (sigset_t *) 0); sigprocmask(SIG_SETMASK, &mask, (sigset_t *) 0);
sigemptyset(&sa.sa_mask); sigemptyset(&sa.sa_mask);
sa.sa_flags = 0; sa.sa_flags = 0;
@ -560,6 +562,15 @@ single_user()
if (getsecuritylevel() > 0) if (getsecuritylevel() > 0)
setsecuritylevel(0); setsecuritylevel(0);
if (reboot) {
/* Instead of going single user, let's halt the machine */
sync();
alarm(2);
pause();
reboot(RB_AUTOBOOT);
_exit(0);
}
if ((pid = fork()) == 0) { if ((pid = fork()) == 0) {
/* /*
* Start the single user session. * Start the single user session.
@ -1129,6 +1140,8 @@ transition_handler(sig)
case SIGHUP: case SIGHUP:
requested_transition = clean_ttys; requested_transition = clean_ttys;
break; break;
case SIGINT:
reboot = TRUE;
case SIGTERM: case SIGTERM:
requested_transition = death; requested_transition = death;
break; break;