[Midnightbsd-cvs] src [11240] trunk/sbin/ccdconfig/ccdconfig.c: sync

[laffer1 at midnightbsd.org]

Revision: 11240
          http://svnweb.midnightbsd.org/src/?rev=11240
Author:   laffer1
Date:     2018-07-01 17:17:56 -0400 (Sun, 01 Jul 2018)
Log Message:
-----------
sync

Modified Paths:
--------------
    trunk/sbin/ccdconfig/Makefile
    trunk/sbin/ccdconfig/ccdconfig.8
    trunk/sbin/ccdconfig/ccdconfig.c

Property Changed:
----------------
    trunk/sbin/ccdconfig/ccdconfig.8

Modified: trunk/sbin/ccdconfig/Makefile
===================================================================
--- trunk/sbin/ccdconfig/Makefile	2018-07-01 21:17:31 UTC (rev 11239)
+++ trunk/sbin/ccdconfig/Makefile	2018-07-01 21:17:56 UTC (rev 11240)
@@ -1,4 +1,5 @@
 # $MidnightBSD$
+# $FreeBSD: stable/10/sbin/ccdconfig/Makefile 198236 2009-10-19 16:00:24Z ru $
 
 PROG=	ccdconfig
 MAN=	ccdconfig.8

Modified: trunk/sbin/ccdconfig/ccdconfig.8
===================================================================
--- trunk/sbin/ccdconfig/ccdconfig.8	2018-07-01 21:17:31 UTC (rev 11239)
+++ trunk/sbin/ccdconfig/ccdconfig.8	2018-07-01 21:17:56 UTC (rev 11240)
@@ -1,3 +1,4 @@
+.\" $MidnightBSD$
 .\"	$NetBSD: ccdconfig.8,v 1.1.2.1 1995/11/11 02:43:33 thorpej Exp $
 .\"
 .\" Copyright (c) 1995 Jason R. Thorpe.
@@ -26,9 +27,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $MidnightBSD$
+.\" $FreeBSD: stable/10/sbin/ccdconfig/ccdconfig.8 306979 2016-10-10 16:11:51Z sevan $
 .\"
-.Dd July 17, 1995
+.Dd October 3, 2016
 .Dt CCDCONFIG 8
 .Os
 .Sh NAME
@@ -159,7 +160,7 @@
 to a two disk stripe of da6 and da7.
 The last example is a simple
 mirror.
-The 2nd slice of /dev/da8 is mirrored with the 3rd slice of /dev/da9
+The second slice of /dev/da8 is mirrored with the third slice of /dev/da9
 and assigned to ccd0.
 .Bd -literal
 # ccdconfig ccd0 64 none /dev/da0s1 /dev/da1s1 /dev/da2s1 /dev/da3s1
@@ -180,7 +181,7 @@
 mdadm --create --chunk=32 --level=0 --raid-devices=2 /dev/md0 \\
    /dev/hda1 /dev/hdb1
 # Make the RAID-0 just created available on FreeBSD:
-ccdconfig -c /dev/ccd0 32 linux /dev/ad0s1 /dev/ad0s2
+ccdconfig -c /dev/ccd0 32 linux /dev/ada0s1 /dev/ada0s2
 .Ed
 .Pp
 When you create a new ccd disk you generally want to
@@ -234,19 +235,19 @@
 or software RAID systems such as
 .Xr geom 8
 and
-.Xr vinum 8 .
+.Xr gvinum 8 .
 .Sh SEE ALSO
 .Xr dd 1 ,
 .Xr ccd 4 ,
 .Xr disklabel 8 ,
 .Xr fdisk 8 ,
-.Xr rc 8 ,
-.Xr vinum 8
+.Xr gvinum 8 ,
+.Xr rc 8
 .Sh HISTORY
 The
 .Nm
 utility first appeared in
-.Nx 1.0a .
+.Nx 1.1 .
 .Sh BUGS
 The initial disklabel returned by
 .Xr ccd 4


Property changes on: trunk/sbin/ccdconfig/ccdconfig.8
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/sbin/ccdconfig/ccdconfig.c
===================================================================
--- trunk/sbin/ccdconfig/ccdconfig.c	2018-07-01 21:17:31 UTC (rev 11239)
+++ trunk/sbin/ccdconfig/ccdconfig.c	2018-07-01 21:17:56 UTC (rev 11240)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*
  * Copyright (c) 2003 Poul-Henning Kamp
  * Copyright (c) 1995 Jason R. Thorpe.
@@ -32,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sbin/ccdconfig/ccdconfig.c 241848 2012-10-22 03:07:05Z eadler $");
 
 #include <sys/param.h>
 #include <sys/linker.h>
@@ -59,7 +60,7 @@
 static	int verbose = 0;
 static	const char *ccdconf = _PATH_CCDCONF;
 
-struct	flagval {
+static struct flagval {
 	const char	*fv_flag;
 	int		fv_val;
 } flagvaltab[] = {