[src/netbsd-1-5]: src/sbin/disklabel Pullup 1.88 (with 1.89) [christos]:

[tv <tv%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d956414ca871
branches:  netbsd-1-5
changeset: 489876:d956414ca871
user:      tv <tv%NetBSD.org@localhost>
date:      Wed Oct 18 02:27:44 2000 +0000

description:
Pullup 1.88 (with 1.89) [christos]:
Allow -i with -I.

diffstat:

 sbin/disklabel/disklabel.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r e23ff16cd20f -r d956414ca871 sbin/disklabel/disklabel.c
--- a/sbin/disklabel/disklabel.c        Wed Oct 18 02:23:03 2000 +0000
+++ b/sbin/disklabel/disklabel.c        Wed Oct 18 02:27:44 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: disklabel.c,v 1.84.2.3 2000/10/18 00:39:43 tv Exp $    */
+/*     $NetBSD: disklabel.c,v 1.84.2.4 2000/10/18 02:27:44 tv Exp $    */
 
 /*
  * Copyright (c) 1987, 1993
@@ -47,7 +47,7 @@
 static char sccsid[] = "@(#)disklabel.c        8.4 (Berkeley) 5/4/95";
 /* from static char sccsid[] = "@(#)disklabel.c        1.2 (Symmetric) 11/28/85"; */
 #else
-__RCSID("$NetBSD: disklabel.c,v 1.84.2.3 2000/10/18 00:39:43 tv Exp $");
+__RCSID("$NetBSD: disklabel.c,v 1.84.2.4 2000/10/18 02:27:44 tv Exp $");
 #endif
 #endif /* not lint */
 
@@ -270,7 +270,7 @@
        if (argc < 1)
                usage();
 
-       if (Iflag && op != EDIT)
+       if (Iflag && op != EDIT && op != INTERACT)
                usage();
 
        dkname = argv[0];
@@ -1900,7 +1900,7 @@
        },
        { "-e [-r] [-I] [-C] disk",
            "(to edit label)" },
-       { "-i [-r] disk",
+       { "-i [-I] [-r] disk",
            "(to create a label interactively)" },
        { "-R [-r] disk protofile",
 #if NUMBOOT > 0