From f18cf4b433e70cc12e7ebacebc3b94cda031ee6e Mon Sep 17 00:00:00 2001 From: Theo de Raadt Date: Sun, 29 Mar 2009 05:37:14 +0000 Subject: 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 --- sbin/disklabel/editor.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'sbin/disklabel/editor.c') 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 @@ -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 @@ -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; -- cgit v1.2.3