summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkrw <krw@openbsd.org>2016-09-03 17:46:19 +0000
committerkrw <krw@openbsd.org>2016-09-03 17:46:19 +0000
commita51ea6b81f8c74e1e51001111e17d3056fb811d1 (patch)
tree677f22f399f99926dfd5694587efd2d24d5a75c3
parentSwitch back to 256 KB socket buffer size for TCP. With 2 MB the (diff)
downloadwireguard-openbsd-a51ea6b81f8c74e1e51001111e17d3056fb811d1.tar.xz
wireguard-openbsd-a51ea6b81f8c74e1e51001111e17d3056fb811d1.zip
'reinit' should check the MBR on disk, as the man page says.
Makes 'reinit' respect current state of disk when deciding between MBR and GPT initialization. Problem noted by halex@
-rw-r--r--sbin/fdisk/cmd.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sbin/fdisk/cmd.c b/sbin/fdisk/cmd.c
index 0a78cf35fdd..37acb4dad1b 100644
--- a/sbin/fdisk/cmd.c
+++ b/sbin/fdisk/cmd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd.c,v 1.96 2016/08/02 16:00:10 jcs Exp $ */
+/* $OpenBSD: cmd.c,v 1.97 2016/09/03 17:46:19 krw Exp $ */
/*
* Copyright (c) 1997 Tobias Weingartner
@@ -54,7 +54,7 @@ Xreinit(char *args, struct mbr *mbr)
else if (strlen(args) > 0) {
printf("Unrecognized modifier '%s'\n", args);
return (CMD_CONT);
- } else if (MBR_protective_mbr(&initial_mbr) == 0)
+ } else if (MBR_protective_mbr(mbr) == 0)
dogpt = 1;
else
dogpt = 0;