summaryrefslogtreecommitdiffstats
path: root/usr.sbin/installboot
diff options
context:
space:
mode:
authorkrw <krw@openbsd.org>2015-10-28 19:38:08 +0000
committerkrw <krw@openbsd.org>2015-10-28 19:38:08 +0000
commit11d331b1855aa636c6eb1a15b5e68424c0dc8adb (patch)
tree747d25e307fa528ca4dc54715803824442c17186 /usr.sbin/installboot
parentadd pledge to main process, though it needs a few more options (diff)
downloadwireguard-openbsd-11d331b1855aa636c6eb1a15b5e68424c0dc8adb.tar.xz
wireguard-openbsd-11d331b1855aa636c6eb1a15b5e68424c0dc8adb.zip
Revert GPT change. Breaks non-GPT install/upgrade.
Found the hard way by reyk@
Diffstat (limited to 'usr.sbin/installboot')
-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)