Changed Makefiles: drivers are now installed in /usr/sbin.

TTY now gets SYS_EVENT message with sigset (e.g., SIGKMESS, SIGKSTOP).
This commit is contained in:
Jorrit Herder 2005-07-19 12:12:48 +00:00
parent f2e16763e7
commit 8c024e28a1
11 changed files with 34 additions and 21 deletions

View file

@ -30,8 +30,8 @@ $(LIBDRIVER):
cd $d/libdriver && $(MAKE)
# install with other drivers
install: /usr/sbin/drivers/$(DRIVER)
/usr/sbin/drivers/$(DRIVER): $(DRIVER)
install: /usr/sbin/$(DRIVER)
/usr/sbin/$(DRIVER): $(DRIVER)
install -o root -cs $? $@
# clean up local files

View file

@ -2,6 +2,10 @@
## Makefile for ISA ethernet drivers May 02, 2000
##
## $Log$
## Revision 1.2 2005/07/19 12:12:47 jnherder
## Changed Makefiles: drivers are now installed in /usr/sbin.
## TTY now gets SYS_EVENT message with sigset (e.g., SIGKMESS, SIGKSTOP).
##
## Revision 1.1 2005/06/29 10:16:46 beng
## Import of dpeth 3c501/3c509b/.. ethernet driver by
## Giovanni Falzoni <fgalzoni@inwind.it>.
@ -34,8 +38,8 @@ $(DRIVER): $(OBJS)
install -S 4kw $(DRIVER)
## Install with other drivers
install: /usr/sbin/drivers/$(DRIVER)
/usr/sbin/drivers/$(DRIVER): $(DRIVER)
install: /usr/sbin/$(DRIVER)
/usr/sbin/$(DRIVER): $(DRIVER)
install -o root -cs $? $@
## Generate dependencies

View file

@ -29,8 +29,8 @@ $(LIBDRIVER):
cd $d/libdriver && $(MAKE)
# install with other drivers
install: /usr/sbin/drivers/$(DRIVER)
/usr/sbin/drivers/$(DRIVER): $(DRIVER)
install: /usr/sbin/$(DRIVER)
/usr/sbin/$(DRIVER): $(DRIVER)
install -o root -cs $? $@
# clean up local files

View file

@ -28,8 +28,8 @@ $(LIBPCI):
cd $d/libpci && $(MAKE)
# install with other drivers
install: /usr/sbin/drivers/$(DRIVER)
/usr/sbin/drivers/$(DRIVER): $(DRIVER)
install: /usr/sbin/$(DRIVER)
/usr/sbin/$(DRIVER): $(DRIVER)
install -o root -cs $? $@
# clean up local files

View file

@ -29,8 +29,8 @@ $(LIBDRIVER):
cd $d/libdriver && $(MAKE)
# install with other drivers
install: /usr/sbin/drivers/$(DRIVER)
/usr/sbin/drivers/$(DRIVER): $(DRIVER)
install: /usr/sbin/$(DRIVER)
/usr/sbin/$(DRIVER): $(DRIVER)
install -o root -cs $? $@
# clean up local files

View file

@ -36,8 +36,8 @@ aes/rijndael_alg.o:
$(CC) -c -o $@ aes/rijndael_alg.c
# install with other drivers
install: /usr/sbin/drivers/$(DRIVER)
/usr/sbin/drivers/$(DRIVER): $(DRIVER)
install: /usr/sbin/$(DRIVER)
/usr/sbin/$(DRIVER): $(DRIVER)
install -o root -cs $? $@
# clean up local files

View file

@ -24,8 +24,8 @@ $(DRIVER): $(OBJ)
# install -S 64w $(DRIVER)
# install with other drivers
install: /usr/sbin/drivers/$(DRIVER)
/usr/sbin/drivers/$(DRIVER): $(DRIVER)
install: /usr/sbin/$(DRIVER)
/usr/sbin/$(DRIVER): $(DRIVER)
install -o root -c $? $@
# install -o root -cs $? $@

View file

@ -30,8 +30,8 @@ $(PCI):
cd $d/libpci && $(MAKE)
# install with other drivers
install: /usr/sbin/drivers/$(DRIVER)
/usr/sbin/drivers/$(DRIVER): $(DRIVER)
install: /usr/sbin/$(DRIVER)
/usr/sbin/$(DRIVER): $(DRIVER)
install -o root -cs $? $@
# clean up local files

View file

@ -26,9 +26,9 @@ $(DRIVER): $(OBJ)
install -S 256w $(DRIVER)
# install with other drivers
install: /usr/sbin/drivers/$(DRIVER)
install: /usr/sbin/$(DRIVER)
cd keymaps && $(MAKE) -$(MAKEFLAGS) $@
/usr/sbin/drivers/$(DRIVER): $(DRIVER)
/usr/sbin/$(DRIVER): $(DRIVER)
install -o root -cs $? $@
# clean up local files

View file

@ -629,7 +629,7 @@ message *m; /* request message to TTY */
*/
while (nb_receive(ANY, m) == OK) {
switch(m->m_type) {
case NEW_KMESS: do_new_kmess(m); break;
case SYS_EVENT: do_new_kmess(m); break;
case DIAGNOSTICS: do_diagnostics(m); break;
default: ; /* do nothing */
}

View file

@ -204,9 +204,18 @@ PUBLIC void main(void)
expire_timers(); /* run watchdogs of expired timers */
continue; /* contine to check for events */
}
case NEW_KMESS: /* new kernel message is available */
do_new_kmess(&tty_mess);
case SYS_EVENT: { /* new kernel message is available */
sigset_t sigset = (sigset_t) tty_mess.NOTIFY_ARG;
if (sigismember(&sigset, SIGKMESS)) {
do_new_kmess(&tty_mess);
} else if (sigismember(&sigset, SIGTERM)) {
cons_stop(); /* first switch to primary console */
} else if (sigismember(&sigset, SIGKSTOP)) {
cons_stop(); /* switch to primary console */
do_panic_dumps(&tty_mess);
}
continue;
}
case HARD_STOP: { /* MINIX is going down */
static int stop = 0; /* expect two HARD_STOP messages */
if (! stop++) {