diff options
| author | Stefan Sperling <stsp@cvs.openbsd.org> | 2013-10-20 13:25:22 +0000 |
|---|---|---|
| committer | Stefan Sperling <stsp@cvs.openbsd.org> | 2013-10-20 13:25:22 +0000 |
| commit | 4f1aa8321d9150707370a6c40391a5628001177c (patch) | |
| tree | 2c1d1929e6fe8663886192867ef17cfaeb1eb242 /sys/arch/amd64/stand/boot/conf.c | |
| parent | 61bd4a4131e18bb24f2ad10a92eb864d8c2b205c (diff) | |
Add i386/amd64 boot(8) support for keydisk-based softraid crypto volumes.
So far, only passphrase-based crypto volumes were bootable. Full disk
encryption with keydisks required a non-crypto partition to load the kernel.
The bootloader now scans all BIOS-visible disks for RAID partitions and
automatically associates keydisk partitions with their crypto volume.
Attempting to boot from a volume without its keydisk currently results
in a passphrase prompt (this might be changed in the future).
There is no need to re-create existing volumes. Moving the root partition
onto the crypto disk and running installboot(8) is all that's needed.
help & ok jsing
Diffstat (limited to 'sys/arch/amd64/stand/boot/conf.c')
| -rw-r--r-- | sys/arch/amd64/stand/boot/conf.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/arch/amd64/stand/boot/conf.c b/sys/arch/amd64/stand/boot/conf.c index 4587d194a94..152792e4701 100644 --- a/sys/arch/amd64/stand/boot/conf.c +++ b/sys/arch/amd64/stand/boot/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.26 2012/10/27 15:43:42 jsing Exp $ */ +/* $OpenBSD: conf.c,v 1.27 2013/10/20 13:25:20 stsp Exp $ */ /* * Copyright (c) 1996 Michael Shalayeff @@ -42,7 +42,7 @@ #include <biosdev.h> #include <dev/cons.h> -const char version[] = "3.23"; +const char version[] = "3.24"; int debug = 1; |