From 16964916dad2f64b2fb84763d48a8b18c7e9daf3 Mon Sep 17 00:00:00 2001 From: stsp Date: Wed, 28 Oct 2015 20:32:41 +0000 Subject: Backout the backout of installboot softraid non-gpt case fix. krw and I crossed streams --- usr.sbin/installboot/i386_softraid.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'usr.sbin/installboot/i386_softraid.c') 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 * @@ -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) -- cgit v1.2.3-59-g8ed1b