From 5571360484c931bf2baf536c3b0f9e4fd24c74f1 Mon Sep 17 00:00:00 2001
From: Theo de Raadt <deraadt@cvs.openbsd.org>
Date: Fri, 6 Feb 1998 22:17:21 +0000
Subject: add FS_CCD, make ccd prefer such partitions. It still accespts
 FS_BSDFFS, and something will change about that soon

---
 sys/dev/ccd.c       | 5 +++--
 sys/sys/disklabel.h | 5 ++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'sys')

diff --git a/sys/dev/ccd.c b/sys/dev/ccd.c
index e4ec4daa468..b82b527106f 100644
--- a/sys/dev/ccd.c
+++ b/sys/dev/ccd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ccd.c,v 1.33 1998/01/25 09:42:31 niklas Exp $	*/
+/*	$OpenBSD: ccd.c,v 1.34 1998/02/06 22:17:16 deraadt Exp $	*/
 /*	$NetBSD: ccd.c,v 1.33 1996/05/05 04:21:14 thorpej Exp $	*/
 
 /*-
@@ -356,7 +356,8 @@ ccdinit(ccd, cpaths, p)
 			free(cs->sc_cinfo, M_DEVBUF);
 			return (error);
 		}
-		if (dpart.part->p_fstype == FS_BSDFFS) {
+		if (dpart.part->p_fstype == FS_CCD ||
+		    dpart.part->p_fstype == FS_BSDFFS) {
 			maxsecsize =
 			    ((dpart.disklab->d_secsize > maxsecsize) ?
 			    dpart.disklab->d_secsize : maxsecsize);
diff --git a/sys/sys/disklabel.h b/sys/sys/disklabel.h
index e42ab0359cb..2c01554c954 100644
--- a/sys/sys/disklabel.h
+++ b/sys/sys/disklabel.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disklabel.h,v 1.13 1997/08/08 21:47:06 niklas Exp $	*/
+/*	$OpenBSD: disklabel.h,v 1.14 1998/02/06 22:17:18 deraadt Exp $	*/
 /*	$NetBSD: disklabel.h,v 1.41 1996/05/10 23:07:37 mark Exp $	*/
 
 /*
@@ -237,6 +237,7 @@ static char *dktypenames[] = {
 #define	FS_HFS		15		/* Macintosh HFS */
 #define	FS_ADFS		16		/* Acorn Disk Filing System */
 #define FS_EXT2FS	17		/* ext2fs */
+#define FS_CCD		18		/* ccd component */
 
 #ifdef DKTYPENAMES
 static char *fstypenames[] = {
@@ -258,6 +259,7 @@ static char *fstypenames[] = {
 	"HFS",
 	"ADFS",
 	"ext2fs",
+	"ccd",
 	NULL
 };
 
@@ -281,6 +283,7 @@ static char *fstypesnames[] = {
 	"",		/* 15 */
 	"",		/* 16 */
 	"ext2fs",	/* 17 */
+	"",		/* 18 */
 	NULL
 };
 
-- 
cgit v1.2.3