diff options
| author | Philip Guenther <guenther@cvs.openbsd.org> | 2022-01-04 18:13:32 +0000 |
|---|---|---|
| committer | Philip Guenther <guenther@cvs.openbsd.org> | 2022-01-04 18:13:32 +0000 |
| commit | c87d98396e84f7d4a019b5da3358e9e588d5d96d (patch) | |
| tree | a42f9c3710bae004280417c7e7a64c467a2208b9 /sys/kern | |
| parent | bbaeb9638de2932aa9c0b0728fc5a1bf329996c9 (diff) | |
Use the device we read the hibernate signature from for the entire
resume. This fixes setups where a umass device no longer attaching
at resume results in a softraid device being renumbered so the
hibernate-time device is no longer correct
ok mlarkin@ jsing@
Diffstat (limited to 'sys/kern')
| -rw-r--r-- | sys/kern/subr_hibernate.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/kern/subr_hibernate.c b/sys/kern/subr_hibernate.c index be5ea6a440c..a9831beb847 100644 --- a/sys/kern/subr_hibernate.c +++ b/sys/kern/subr_hibernate.c @@ -1,4 +1,4 @@ -/* $OpenBSD: subr_hibernate.c,v 1.129 2021/08/31 14:45:25 deraadt Exp $ */ +/* $OpenBSD: subr_hibernate.c,v 1.130 2022/01/04 18:13:31 guenther Exp $ */ /* * Copyright (c) 2011 Ariane van der Steldt <ariane@stack.nl> @@ -1173,6 +1173,7 @@ hibernate_resume(void) splx(s); return; } + disk_hib.dev = hib.dev; #ifdef MULTIPROCESSOR /* XXX - if we fail later, we may need to rehatch APs on some archs */ |