diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 1998-08-05 07:37:38 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 1998-08-05 07:37:38 +0000 |
| commit | b58bd74b823f695a95b58afeac7a236d8ab92661 (patch) | |
| tree | 6c654cb30d6d21dae11b7237cb6029b4f482a703 /sbin | |
| parent | 043d5b094ece8bda4c927288fd597efc764139cd (diff) | |
12 seconds not 30. But I am just about to remove the kill and wait
patch. Obviously it was never tested on a machine running a regular
compliment of services. On such a machine, it causes a full 12 (was
30) second delay *EVERY TIME*. That's COMPLETELY unreasonable.
Diffstat (limited to 'sbin')
| -rw-r--r-- | sbin/reboot/reboot.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sbin/reboot/reboot.c b/sbin/reboot/reboot.c index d3bf499559a..528c45c06e7 100644 --- a/sbin/reboot/reboot.c +++ b/sbin/reboot/reboot.c @@ -1,4 +1,4 @@ -/* $OpenBSD: reboot.c,v 1.12 1998/07/12 07:17:28 angelos Exp $ */ +/* $OpenBSD: reboot.c,v 1.13 1998/08/05 07:37:37 deraadt Exp $ */ /* $NetBSD: reboot.c,v 1.8 1995/10/05 05:36:22 mycroft Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)reboot.c 8.1 (Berkeley) 6/5/93"; #else -static char rcsid[] = "$OpenBSD: reboot.c,v 1.12 1998/07/12 07:17:28 angelos Exp $"; +static char rcsid[] = "$OpenBSD: reboot.c,v 1.13 1998/08/05 07:37:37 deraadt Exp $"; #endif #endif /* not lint */ @@ -202,12 +202,12 @@ main(argc, argv) sync(); /* - * Wait for up to 30 seconds for processes that need a long + * Wait for up to 12 seconds for processes that need a long * time to shut down (e.g., X servers on old slow notebook PCs with * only 8 MB of RAM and a slow disk; or databases), but probe at * 1 second intervals and continue immediately if none are left. */ - for (i=0; i<30; ++i) { + for (i=0; i<12; ++i) { if (kill(-1, 0) == -1) { if (errno == ESRCH) break; |