diff options
| author |   krw <krw@openbsd.org> | 2015-12-01 06:25:43 +0000 |
|---|---|---|
| committer | krw <krw@openbsd.org> | 2015-12-01 06:25:43 +0000 |
| commit | 97fbca1c169ea07c81c835a5f78fcc408636d54d (patch) | |
| tree | f8072471dcd9e885fc659b957584bcc7be55a9ee | |
| parent | sync (diff) | |
| download | wireguard-openbsd-97fbca1c169ea07c81c835a5f78fcc408636d54d.tar.xz wireguard-openbsd-97fbca1c169ea07c81c835a5f78fcc408636d54d.zip | |
Make '-i' set 'reinited' flag so that the initial Xwrite() will zap
any undesirable GPT hanging around. i.e. same as 'reinit' from the
fdisk(8) command line. Noticed now that install media relies on
'-i' rather than issuing 'reinit' in a script.
| -rw-r--r-- | sbin/fdisk/cmd.h | 4 | ||||
| -rw-r--r-- | sbin/fdisk/fdisk.c | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/sbin/fdisk/cmd.h b/sbin/fdisk/cmd.h index af3e7675519..498f55bb129 100644 --- a/sbin/fdisk/cmd.h +++ b/sbin/fdisk/cmd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cmd.h,v 1.18 2015/10/26 15:08:26 krw Exp $ */ +/* $OpenBSD: cmd.h,v 1.19 2015/12/01 06:25:43 krw Exp $ */ /* * Copyright (c) 1997 Tobias Weingartner @@ -33,6 +33,8 @@ struct cmd { }; extern struct cmd cmd_table[]; +extern int reinited; + int Xreinit(char *, struct mbr *); int Xdisk(char *, struct mbr *); int Xmanual(char *, struct mbr *); diff --git a/sbin/fdisk/fdisk.c b/sbin/fdisk/fdisk.c index 40b83ca3770..5314713fa8c 100644 --- a/sbin/fdisk/fdisk.c +++ b/sbin/fdisk/fdisk.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fdisk.c,v 1.95 2015/11/24 01:01:56 deraadt Exp $ */ +/* $OpenBSD: fdisk.c,v 1.96 2015/12/01 06:25:43 krw Exp $ */ /* * Copyright (c) 1997 Tobias Weingartner @@ -210,6 +210,7 @@ main(int argc, char *argv[]) query = NULL; if (i_flag) { + reinited = 1; if (g_flag) { MBR_init_GPT(&initial_mbr); GPT_init(); |