summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason McIntyre <jmc@cvs.openbsd.org>2015-09-06 09:06:24 +0000
committerJason McIntyre <jmc@cvs.openbsd.org>2015-09-06 09:06:24 +0000
commitbb2019a065fb04891b8a8c106dddf0384089e133 (patch)
tree356e3e104b74a878a7aa1c0bd8719af7c931d0f0
parent927ffb6b96c93229147711b75f1c80109b8598da (diff)
correct a mistake in my previous commit;
-rw-r--r--sbin/fdisk/fdisk.86
-rw-r--r--sbin/fdisk/fdisk.c6
2 files changed, 6 insertions, 6 deletions
diff --git a/sbin/fdisk/fdisk.8 b/sbin/fdisk/fdisk.8
index 081455ae55f..0db0bfe73b9 100644
--- a/sbin/fdisk/fdisk.8
+++ b/sbin/fdisk/fdisk.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: fdisk.8,v 1.81 2015/09/04 21:19:45 jmc Exp $
+.\" $OpenBSD: fdisk.8,v 1.82 2015/09/06 09:06:23 jmc Exp $
.\"
.\"
.\" Copyright (c) 1997 Tobias Weingartner
@@ -15,7 +15,7 @@
.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.Dd $Mdocdate: September 4 2015 $
+.Dd $Mdocdate: September 6 2015 $
.Dt FDISK 8
.Os
.Sh NAME
@@ -24,6 +24,7 @@
.Sh SYNOPSIS
.Nm fdisk
.Op Fl egy
+.Op Fl i | u
.Op Fl b Ar blocks
.Oo
.Fl c Ar cylinders
@@ -31,7 +32,6 @@
.Fl s Ar sectors
.Oc
.Op Fl f Ar mbrfile
-.Op Fl i | u
.Op Fl l Ar blocks
.Ar disk
.Sh DESCRIPTION
diff --git a/sbin/fdisk/fdisk.c b/sbin/fdisk/fdisk.c
index e8bbd4f9a63..9411d969f3a 100644
--- a/sbin/fdisk/fdisk.c
+++ b/sbin/fdisk/fdisk.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fdisk.c,v 1.76 2015/09/04 21:19:45 jmc Exp $ */
+/* $OpenBSD: fdisk.c,v 1.77 2015/09/06 09:06:23 jmc Exp $ */
/*
* Copyright (c) 1997 Tobias Weingartner
@@ -49,8 +49,8 @@ usage(void)
extern char * __progname;
fprintf(stderr, "usage: %s "
- "[-egy] [-b blocks] [-c # -h # -s #] [-f mbrfile] "
- "[-i|-u] [-l blocks] disk\n"
+ "[-egy] [-i|-u] [-b blocks] [-c # -h # -s #] "
+ "[-f mbrfile] [-l blocks] disk\n"
"\t-b: add special boot partition; requires -i\n"
"\t-chs: specify disk geometry\n"
"\t-e: edit MBRs on disk interactively\n"