summaryrefslogtreecommitdiff
path: root/usr.sbin
diff options
context:
space:
mode:
authorKenneth R Westerback <krw@cvs.openbsd.org>2015-10-28 19:38:09 +0000
committerKenneth R Westerback <krw@cvs.openbsd.org>2015-10-28 19:38:09 +0000
commitfe321675b65ff8cd9d215af4417b7c1b934784d3 (patch)
tree3c188e6e03db0b7b74699f499291972dfa22d13b /usr.sbin
parent6e8ab0089b8c04cc2b20fb7da62e2e05fb2ae8c1 (diff)
Revert GPT change. Breaks non-GPT install/upgrade.
Found the hard way by reyk@
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/installboot/i386_softraid.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/usr.sbin/installboot/i386_softraid.c b/usr.sbin/installboot/i386_softraid.c
index b011a73e038..52db462ae9f 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.6 2015/10/28 18:55:27 stsp Exp $ */
+/* $OpenBSD: i386_softraid.c,v 1.7 2015/10/28 19:38:08 krw Exp $ */
/*
* Copyright (c) 2012 Joel Sing <jsing@openbsd.org>
*
@@ -87,12 +87,6 @@ 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)