[Midnightbsd-cvs] src: sbin/ccdconfig: $MidnightBSD$

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Thu Nov 20 14:28:33 EST 2008


Log Message:
-----------
$MidnightBSD$

Modified Files:
--------------
    src/sbin/ccdconfig:
        Makefile (r1.1.1.1 -> r1.2)
        ccdconfig.8 (r1.1.1.1 -> r1.2)
        ccdconfig.c (r1.1.1.1 -> r1.2)
        pathnames.h (r1.1.1.1 -> r1.2)

-------------- next part --------------
Index: ccdconfig.8
===================================================================
RCS file: /home/cvs/src/sbin/ccdconfig/ccdconfig.8,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L sbin/ccdconfig/ccdconfig.8 -L sbin/ccdconfig/ccdconfig.8 -u -r1.1.1.1 -r1.2
--- sbin/ccdconfig/ccdconfig.8
+++ sbin/ccdconfig/ccdconfig.8
@@ -26,7 +26,8 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/sbin/ccdconfig/ccdconfig.8,v 1.33.2.2 2005/08/24 15:42:12 keramida Exp $
+.\" $MidnightBSD$
+.\" $FreeBSD: src/sbin/ccdconfig/ccdconfig.8,v 1.37 2006/04/14 09:20:25 ru Exp $
 .\"
 .Dd July 17, 1995
 .Dt CCDCONFIG 8
@@ -104,6 +105,8 @@
 .Bd -literal -offset indent
 CCDF_UNIFORM	0x02		Use uniform interleave
 CCDF_MIRROR	0x04		Support mirroring
+CCDF_NO_OFFSET	0x08		Do not use an offset
+CCDF_LINUX	0x0A		Linux md(4) compatibility
 .Ed
 .Pp
 The format in the
@@ -127,6 +130,13 @@
 .Dq 4.2BSD
 as shown by
 .Xr disklabel 8 ) .
+.Pp
+If you want to use the
+.Tn Linux
+.Xr md 4
+compatibility mode, please be sure
+to read the notes in
+.Xr ccd 4 .
 .Sh FILES
 .Bl -tag -width /etc/ccd.conf -compact
 .It Pa /etc/ccd.conf
@@ -159,6 +169,22 @@
 # ccdconfig ccd0 128 CCDF_MIRROR /dev/da8s2 /dev/da9s3
 .Ed
 .Pp
+The following are matching commands in
+.Tn Linux
+and
+.Fx
+to create a RAID-0 in
+.Tn Linux
+and read it from
+.Fx .
+.Bd -literal
+# Create a RAID-0 on Linux:
+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
+.Ed
+.Pp
 When you create a new ccd disk you generally want to
 .Xr fdisk 8
 and
Index: Makefile
===================================================================
RCS file: /home/cvs/src/sbin/ccdconfig/Makefile,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L sbin/ccdconfig/Makefile -L sbin/ccdconfig/Makefile -u -r1.1.1.1 -r1.2
--- sbin/ccdconfig/Makefile
+++ sbin/ccdconfig/Makefile
@@ -1,3 +1,4 @@
+# $MidnightBSD$
 # $FreeBSD: src/sbin/ccdconfig/Makefile,v 1.10 2003/08/07 19:10:35 johan Exp $
 
 PROG=	ccdconfig
Index: pathnames.h
===================================================================
RCS file: /home/cvs/src/sbin/ccdconfig/pathnames.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L sbin/ccdconfig/pathnames.h -L sbin/ccdconfig/pathnames.h -u -r1.1.1.1 -r1.2
--- sbin/ccdconfig/pathnames.h
+++ sbin/ccdconfig/pathnames.h
@@ -31,6 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
+ * $MidnightBSD$
  * $FreeBSD: src/sbin/ccdconfig/pathnames.h,v 1.2 2003/01/17 14:53:53 phk Exp $
  */
 
Index: ccdconfig.c
===================================================================
RCS file: /home/cvs/src/sbin/ccdconfig/ccdconfig.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L sbin/ccdconfig/ccdconfig.c -L sbin/ccdconfig/ccdconfig.c -u -r1.1.1.1 -r1.2
--- sbin/ccdconfig/ccdconfig.c
+++ sbin/ccdconfig/ccdconfig.c
@@ -32,7 +32,8 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sbin/ccdconfig/ccdconfig.c,v 1.35 2005/02/10 09:19:28 ru Exp $");
+__FBSDID("$FreeBSD: src/sbin/ccdconfig/ccdconfig.c,v 1.37 2006/04/13 20:35:31 cracauer Exp $");
+__MBSDID("$MidnightBSD$");
 
 #include <sys/param.h>
 #include <sys/linker.h>
@@ -50,6 +51,8 @@
 
 #define CCDF_UNIFORM    0x02    /* use LCCD of sizes for uniform interleave */
 #define CCDF_MIRROR     0x04    /* use mirroring */
+#define CCDF_NO_OFFSET  0x08    /* do not leave space in front */
+#define CCDF_LINUX      0x10    /* use Linux compatibility mode */
 
 #include "pathnames.h"
 
@@ -65,6 +68,10 @@
 	{ "uniform",		CCDF_UNIFORM },
 	{ "CCDF_MIRROR",	CCDF_MIRROR },
 	{ "mirror",		CCDF_MIRROR },
+	{ "CCDF_NO_OFFSET",	CCDF_NO_OFFSET },
+	{ "no_offset",		CCDF_NO_OFFSET },
+	{ "CCDF_LINUX",		CCDF_LINUX },
+	{ "linux",		CCDF_LINUX },
 	{ "none",		0 },
 	{ NULL,			0 },
 };
@@ -245,6 +252,10 @@
 		gctl_ro_param(grq, "uniform", -1, "");
 	if (flags & CCDF_MIRROR)
 		gctl_ro_param(grq, "mirror", -1, "");
+	if (flags & CCDF_NO_OFFSET)
+		gctl_ro_param(grq, "no_offset", -1, "");
+	if (flags & CCDF_LINUX)
+		gctl_ro_param(grq, "linux", -1, "");
 	gctl_ro_param(grq, "nprovider", sizeof(argc), &argc);
 	for (i = 0; i < argc; i++) {
 		sprintf(buf1, "provider%d", i);
@@ -397,7 +408,6 @@
 {
 	char *cp, *tok;
 	int i, tmp, val;
-	size_t flagslen;
 
 	errno = 0;	/* to check for ERANGE */
 	val = (int)strtol(flags, &cp, 0);
@@ -407,7 +417,6 @@
 		return (val);
 	}
 
-	flagslen = strlen(flags);
 	/* Check for values represented by strings. */
 	if ((cp = strdup(flags)) == NULL)
 		err(1, "no memory to parse flags");


More information about the Midnightbsd-cvs mailing list