diff options
| author |   deraadt <deraadt@openbsd.org> | 2009-03-29 05:37:13 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2009-03-29 05:37:13 +0000 |
| commit | 95fa422d7f6194b9b53a4d8b3c4ecc092bc11222 (patch) | |
| tree | 8c3e6c00744046b91543507f22d32cf0fc0d3402 /sbin/disklabel/editor.c | |
| parent | Remove the lock_time member from the hardware lock. It's not that (diff) | |
| download | wireguard-openbsd-95fa422d7f6194b9b53a4d8b3c4ecc092bc11222.tar.xz wireguard-openbsd-95fa422d7f6194b9b53a4d8b3c4ecc092bc11222.zip | |
otto points out that the -v printing changes are incompatible with the
expectation that -R will read the output of disklabel. I suspect we
will find another way to do this; ok otto
Diffstat (limited to 'sbin/disklabel/editor.c')
| -rw-r--r-- | sbin/disklabel/editor.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/sbin/disklabel/editor.c b/sbin/disklabel/editor.c index 17806e5f016..baf72f5337b 100644 --- a/sbin/disklabel/editor.c +++ b/sbin/disklabel/editor.c @@ -1,4 +1,4 @@ -/* $OpenBSD: editor.c,v 1.181 2009/03/28 17:50:05 deraadt Exp $ */ +/* $OpenBSD: editor.c,v 1.182 2009/03/29 05:37:13 deraadt Exp $ */ /* * Copyright (c) 1997-2000 Todd C. Miller <Todd.Miller@courtesan.com> @@ -17,7 +17,7 @@ */ #ifndef lint -static char rcsid[] = "$OpenBSD: editor.c,v 1.181 2009/03/28 17:50:05 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: editor.c,v 1.182 2009/03/29 05:37:13 deraadt Exp $"; #endif /* not lint */ #include <sys/types.h> @@ -288,8 +288,7 @@ editor(struct disklabel *lp, int f, char *dev, char *fstabfile, int aflag) break; case 'l': - display(stdout, &label, mountpoints, arg ? *arg : 0, - SHOW_PHYSINFO); + display(stdout, &label, mountpoints, arg ? *arg : 0, 0); break; case 'M': { @@ -373,8 +372,7 @@ editor(struct disklabel *lp, int f, char *dev, char *fstabfile, int aflag) if ((fp = fopen(arg, "w")) == NULL) { warn("cannot open %s", arg); } else { - display(fp, &label, NULL, 0, SHOW_PHYSINFO | - SHOW_PARTINFO); + display(fp, &label, NULL, 0, 1); (void)fclose(fp); } break; |