allow -I -i to install a new label interactively.

This commit is contained in:
christos 2000-10-08 23:32:50 +00:00
parent 3290ef5fe8
commit c4c61b5a08
2 changed files with 10 additions and 5 deletions

View File

@ -1,4 +1,4 @@
.\" $NetBSD: disklabel.8,v 1.32 2000/08/12 18:52:42 jhawk Exp $
.\" $NetBSD: disklabel.8,v 1.33 2000/10/08 23:32:50 christos Exp $
.\"
.\" Copyright (c) 1987, 1988, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@ -66,6 +66,7 @@
.Ar disk
.Nm ""
.Fl i
.Op Fl I
.Op Fl r
.Ar disk
.Nm ""
@ -330,6 +331,10 @@ Existing bootstrap code is unaffected.
As previous, but don't fail if there was no label on the disk yet;
provide some default values instead.
.Pp
.Dl disklabel -i -I sd0
.Pp
As previous, only use the built-in interactive editor.
.Pp
.Dl disklabel -R sd0 mylabel
.Pp
Restore the on-disk and in-core label for sd0 from information in

View File

@ -1,4 +1,4 @@
/* $NetBSD: disklabel.c,v 1.87 2000/08/14 22:37:08 lukem Exp $ */
/* $NetBSD: disklabel.c,v 1.88 2000/10/08 23:32:50 christos Exp $ */
/*
* Copyright (c) 1987, 1993
@ -47,7 +47,7 @@ __COPYRIGHT("@(#) Copyright (c) 1987, 1993\n\
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.87 2000/08/14 22:37:08 lukem Exp $");
__RCSID("$NetBSD: disklabel.c,v 1.88 2000/10/08 23:32:50 christos Exp $");
#endif
#endif /* not lint */
@ -270,7 +270,7 @@ main(argc, argv)
if (argc < 1)
usage();
if (Iflag && op != EDIT)
if (Iflag && op != EDIT && op != INTERACT)
usage();
dkname = argv[0];
@ -1900,7 +1900,7 @@ usage()
},
{ "%s -e [-r] [-I] [-C] disk",
"(to edit label)" },
{ "%s -i [-r] disk",
{ "%s -i [-I] [-r] disk",
"(to create a label interactively)" },
{ "%s -R [-r] disk protofile",
#if NUMBOOT > 0