diff options
author | Niels Provos <provos@cvs.openbsd.org> | 2000-06-25 18:45:20 +0000 |
---|---|---|
committer | Niels Provos <provos@cvs.openbsd.org> | 2000-06-25 18:45:20 +0000 |
commit | 456df9f91260c95e36f6aeb74f9cd98c545e5616 (patch) | |
tree | 31960e8d00400c701dac94985bf94cb84aebe173 /sys | |
parent | 4fa4397edd76fce075acde822f7debd973038c33 (diff) |
disable automatic crashdump when swap encryption is on
Diffstat (limited to 'sys')
-rw-r--r-- | sys/kern/subr_prf.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/sys/kern/subr_prf.c b/sys/kern/subr_prf.c index 5bd4b69546d..666dc633815 100644 --- a/sys/kern/subr_prf.c +++ b/sys/kern/subr_prf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: subr_prf.c,v 1.29 2000/03/13 04:05:15 millert Exp $ */ +/* $OpenBSD: subr_prf.c,v 1.30 2000/06/25 18:45:19 provos Exp $ */ /* $NetBSD: subr_prf.c,v 1.45 1997/10/24 18:14:25 chuck Exp $ */ /*- @@ -73,6 +73,9 @@ #include <ddb/db_output.h> /* db_printf, db_putchar prototypes */ extern int db_radix; /* XXX: for non-standard '%r' format */ #endif +#if defined(UVM) && defined(UVM_SWAP_ENCRYPT) +extern int uvm_doswapencrypt; +#endif /* @@ -189,6 +192,10 @@ panic(fmt, va_alist) va_list ap; bootopt = RB_AUTOBOOT | RB_DUMP; +#if defined(UVM) && defined(UVM_SWAP_ENCRYPT) + if (uvm_doswapencrypt) + bootopt &= ~RB_DUMP; +#endif va_start(ap, fmt); if (panicstr) bootopt |= RB_NOSYNC; |