diff options
| author |   stsp <stsp@openbsd.org> | 2015-10-28 20:32:41 +0000 |
|---|---|---|
| committer | stsp <stsp@openbsd.org> | 2015-10-28 20:32:41 +0000 |
| commit | 16964916dad2f64b2fb84763d48a8b18c7e9daf3 (patch) | |
| tree | a3e9ae883f51ac07ae05ce6a3137d270af7c0afc | |
| parent | bug in the request tree code: requests were being added to the tree before (diff) | |
| download | wireguard-openbsd-16964916dad2f64b2fb84763d48a8b18c7e9daf3.tar.xz wireguard-openbsd-16964916dad2f64b2fb84763d48a8b18c7e9daf3.zip | |
Backout the backout of installboot softraid non-gpt case fix.
krw and I crossed streams
| -rw-r--r-- | usr.sbin/installboot/i386_softraid.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/usr.sbin/installboot/i386_softraid.c b/usr.sbin/installboot/i386_softraid.c index 52db462ae9f..6010f5112dd 100644 --- a/usr.sbin/installboot/i386_softraid.c +++ b/usr.sbin/installboot/i386_softraid.c @@ -1,4 +1,4 @@ -/* $OpenBSD: i386_softraid.c,v 1.7 2015/10/28 19:38:08 krw Exp $ */ +/* $OpenBSD: i386_softraid.c,v 1.8 2015/10/28 20:32:41 stsp Exp $ */ /* * Copyright (c) 2012 Joel Sing <jsing@openbsd.org> * @@ -87,6 +87,12 @@ sr_install_bootblk(int devfd, int vol, int disk) if (dl.d_type == 0) warnx("disklabel type unknown"); + efipart = findgptefisys(diskfd, &dl); + if (efipart != -1) { + write_efisystem(&dl, (char)efipart); + return; + } + /* Determine poffset and set symbol value. */ pp = &dl.d_partitions[part - 'a']; if (pp->p_offseth != 0) |