diff options
| author | Todd C. Miller <millert@cvs.openbsd.org> | 2000-08-06 00:19:32 +0000 |
|---|---|---|
| committer | Todd C. Miller <millert@cvs.openbsd.org> | 2000-08-06 00:19:32 +0000 |
| commit | eb142c6ce6d7a83c1881e053e8f74f7e59f6b5a7 (patch) | |
| tree | 6f241d5aaa202852932ebb5741d949447415999e /sbin | |
| parent | 90f59e7cb002f283feb749ef1807c81124d8f795 (diff) | |
Add DEFAULT_STATE macro to allow ramdisk init to set default state to
single_user, not runcom (/etc/rc).
Diffstat (limited to 'sbin')
| -rw-r--r-- | sbin/init/init.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/sbin/init/init.c b/sbin/init/init.c index 67ff27722ed..d404cac5acb 100644 --- a/sbin/init/init.c +++ b/sbin/init/init.c @@ -1,4 +1,4 @@ -/* $OpenBSD: init.c,v 1.18 2000/01/22 20:24:58 deraadt Exp $ */ +/* $OpenBSD: init.c,v 1.19 2000/08/06 00:19:31 millert Exp $ */ /* $NetBSD: init.c,v 1.22 1996/05/15 23:29:33 jtc Exp $ */ /*- @@ -47,7 +47,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)init.c 8.2 (Berkeley) 4/28/95"; #else -static char rcsid[] = "$OpenBSD: init.c,v 1.18 2000/01/22 20:24:58 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: init.c,v 1.19 2000/08/06 00:19:31 millert Exp $"; #endif #endif /* not lint */ @@ -90,6 +90,10 @@ static char rcsid[] = "$OpenBSD: init.c,v 1.18 2000/01/22 20:24:58 deraadt Exp $ #define STALL_TIMEOUT 30 /* wait N secs after warning */ #define DEATH_WATCH 10 /* wait N secs for procs to die */ +#ifndef DEFAULT_STATE +#define DEFAULT_STATE runcom +#endif + void handle __P((sig_t, ...)); void delset __P((sigset_t *, ...)); @@ -119,7 +123,7 @@ state_func_t nice_death __P((void)); enum { AUTOBOOT, FASTBOOT } runcom_mode = AUTOBOOT; void transition __P((state_t)); -state_t requested_transition = runcom; +state_t requested_transition = DEFAULT_STATE; void setctty __P((char *)); |