Module Name: src
Committed By: bouyer
Date: Tue Aug 18 11:06:45 UTC 2009
Modified Files:
src/sbin/dkctl [netbsd-4-0]: dkctl.8 dkctl.c
Log Message:
Pull up following revision(s) (requested by spz in ticket #1350):
sbin/dkctl/dkctl.c: revision 1.18
sbin/dkctl/dkctl.8: revision 1.19
list the partition types addwedge understands, so you don't need to utsl
to find out what strings to use here
fixes PR 37252
make dkctl conform to its man page and print the device name on addwedge
when the addition was successful (as well as indicating success).
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.17.16.1 src/sbin/dkctl/dkctl.8
cvs rdiff -u -r1.16 -r1.16.16.1 src/sbin/dkctl/dkctl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/dkctl/dkctl.8
diff -u src/sbin/dkctl/dkctl.8:1.17 src/sbin/dkctl/dkctl.8:1.17.16.1
--- src/sbin/dkctl/dkctl.8:1.17 Thu Jan 12 20:28:29 2006
+++ src/sbin/dkctl/dkctl.8 Tue Aug 18 11:06:45 2009
@@ -1,4 +1,4 @@
-.\" $NetBSD: dkctl.8,v 1.17 2006/01/12 20:28:29 wiz Exp $
+.\" $NetBSD: dkctl.8,v 1.17.16.1 2009/08/18 11:06:45 bouyer Exp $
.\"
.\" Copyright 2002 Wasabi Systems, Inc.
.\" All rights reserved.
@@ -118,6 +118,24 @@
.Ar name
and the partition type
.Ar ptype .
+Valid choices for ptype would be
+.Ar unused ,
+.Ar swap ,
+.Ar ffs ,
+.Ar lfs ,
+.Ar ext2fs ,
+.Ar cd9660 ,
+.Ar ados ,
+.Ar hfs ,
+.Ar msdos ,
+.Ar filecore ,
+.Ar raidframe ,
+.Ar ccd ,
+.Ar appleufs ,
+.Ar ntfs
+and
+.Ar cgd .
+
The device name of the virtual block device assigned to the wedge will be
displayed after the wedge has been successfully created.
See
Index: src/sbin/dkctl/dkctl.c
diff -u src/sbin/dkctl/dkctl.c:1.16 src/sbin/dkctl/dkctl.c:1.16.16.1
--- src/sbin/dkctl/dkctl.c:1.16 Sat Jun 17 02:16:19 2006
+++ src/sbin/dkctl/dkctl.c Tue Aug 18 11:06:45 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: dkctl.c,v 1.16 2006/06/17 02:16:19 christos Exp $ */
+/* $NetBSD: dkctl.c,v 1.16.16.1 2009/08/18 11:06:45 bouyer Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -41,7 +41,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: dkctl.c,v 1.16 2006/06/17 02:16:19 christos Exp $");
+__RCSID("$NetBSD: dkctl.c,v 1.16.16.1 2009/08/18 11:06:45 bouyer Exp $");
#endif
@@ -533,6 +533,9 @@
if (ioctl(fd, DIOCAWEDGE, &dkw) == -1)
err(1, "%s: addwedge", dvname);
+ else
+ printf("%s created successfully.\n", dkw.dkw_devname);
+
}
void