From a26d8773fe9a04ed8bf745ff06c69b49cd83d1ed Mon Sep 17 00:00:00 2001 From: deraadt <> Date: Thu, 6 Oct 2011 20:49:27 +0000 Subject: [PATCH] ccd goes to the attic discussed with jsing and millert --- src/etc/MAKEDEV.common | 4 +--- src/etc/Makefile | 4 ++-- src/etc/ccd.conf | 5 ----- src/etc/changelist | 3 +-- src/etc/etc.alpha/MAKEDEV.md | 4 +--- src/etc/etc.amd64/MAKEDEV.md | 4 +--- src/etc/etc.armish/MAKEDEV.md | 4 +--- src/etc/etc.aviion/MAKEDEV.md | 4 +--- src/etc/etc.hp300/MAKEDEV.md | 12 +++++------- src/etc/etc.hppa/MAKEDEV.md | 4 +--- src/etc/etc.hppa64/MAKEDEV.md | 4 +--- src/etc/etc.i386/MAKEDEV.md | 4 +--- src/etc/etc.landisk/MAKEDEV.md | 4 +--- src/etc/etc.loongson/MAKEDEV.md | 4 +--- src/etc/etc.luna88k/MAKEDEV.md | 4 +--- src/etc/etc.mac68k/MAKEDEV.md | 4 +--- src/etc/etc.macppc/MAKEDEV.md | 4 +--- src/etc/etc.mvme68k/MAKEDEV.md | 4 +--- src/etc/etc.mvme88k/MAKEDEV.md | 4 +--- src/etc/etc.palm/MAKEDEV.md | 4 +--- src/etc/etc.sgi/MAKEDEV.md | 4 +--- src/etc/etc.socppc/MAKEDEV.md | 4 +--- src/etc/etc.sparc/MAKEDEV.md | 4 +--- src/etc/etc.sparc64/MAKEDEV.md | 4 +--- src/etc/etc.vax/MAKEDEV.md | 18 ++++++++---------- src/etc/etc.zaurus/MAKEDEV.md | 4 +--- src/etc/rc | 7 +------ 27 files changed, 38 insertions(+), 95 deletions(-) delete mode 100644 src/etc/ccd.conf diff --git a/src/etc/MAKEDEV.common b/src/etc/MAKEDEV.common index e551a7c3..d494ff8c 100644 --- a/src/etc/MAKEDEV.common +++ b/src/etc/MAKEDEV.common @@ -1,4 +1,4 @@ -vers(a, {-$OpenBSD: MAKEDEV.common,v 1.56 2011/07/06 18:34:20 miod Exp $-})dnl +vers(a, {-$OpenBSD: MAKEDEV.common,v 1.57 2011/10/06 20:49:25 deraadt Exp $-})dnl dnl dnl Copyright (c) 2001-2006 Todd T. Fries dnl @@ -265,7 +265,6 @@ _mkdev(flo, fd*, __devitem(iop, iop*, I2O controller devices)dnl _mcdev(iop, iop*, iop, {-major_iop_c-}, 660)dnl __devitem(wd, {-wd*-}, {-quote(winchester)disk drives (ST506{-,-} IDE{-,-} ESDI{-,-} RLL{-,-} ...)-})dnl -__devitem(ccd, ccd*, Concatenated disk devices)dnl __devitem(raid, raid*, RAIDframe disk devices)dnl __devitem(vnd, vnd*, quote(file)pseudo-disk devices)dnl _mkdev(vnd, vnd*, {-dodisk vnd $U major_vnd_b major_vnd_c $U 0{--}ifstep(vnd)-})dnl @@ -275,7 +274,6 @@ dnl dnl For normal disk devices, add a disk_q entry; anything else define like dnl the rest (such as vnd above). dnl -disk_q({-ccd-})dnl disk_q({-hd-})dnl disk_q({-ra-})dnl disk_q({-raid-})dnl diff --git a/src/etc/Makefile b/src/etc/Makefile index 19faf416..e13c557e 100644 --- a/src/etc/Makefile +++ b/src/etc/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.309 2011/07/22 09:30:54 espie Exp $ +# $OpenBSD: Makefile,v 1.310 2011/10/06 20:49:25 deraadt Exp $ TZDIR= /usr/share/zoneinfo LOCALTIME= Canada/Mountain @@ -30,7 +30,7 @@ kernels: bootblocks ${ALL_KERNELS} # -rw-r--r-- BINOWN= root BINGRP= wheel -BIN1= changelist ccd.conf csh.cshrc csh.login csh.logout daily dhcpd.conf \ +BIN1= changelist csh.cshrc csh.login csh.logout daily dhcpd.conf \ exports ftpusers ftpchroot gettytab group hosts hosts.lpd inetd.conf \ ksh.kshrc locate.rc man.conf monthly motd mrouted.conf myname \ netstart networks newsyslog.conf printcap protocols \ diff --git a/src/etc/ccd.conf b/src/etc/ccd.conf deleted file mode 100644 index 8e84e4b5..00000000 --- a/src/etc/ccd.conf +++ /dev/null @@ -1,5 +0,0 @@ -# $OpenBSD: ccd.conf,v 1.1 1996/08/24 20:52:22 deraadt Exp $ -# Configuration file for concatenated disk devices -# -# ccd ileave flags component devices -#ccd0 16 none /dev/sd2e /dev/sd3e diff --git a/src/etc/changelist b/src/etc/changelist index d17a9e81..e5c1bb83 100644 --- a/src/etc/changelist +++ b/src/etc/changelist @@ -1,4 +1,4 @@ -# $OpenBSD: changelist,v 1.74 2011/07/07 06:15:53 schwarze Exp $ +# $OpenBSD: changelist,v 1.75 2011/10/06 20:49:25 deraadt Exp $ # # List of files which the security script backs up and checks # for modifications. @@ -13,7 +13,6 @@ /etc/bgpd.conf /etc/boot.conf /etc/bootparams -/etc/ccd.conf /etc/changelist /etc/chio.conf /etc/crontab diff --git a/src/etc/etc.alpha/MAKEDEV.md b/src/etc/etc.alpha/MAKEDEV.md index bd856757..4dc7f5c7 100644 --- a/src/etc/etc.alpha/MAKEDEV.md +++ b/src/etc/etc.alpha/MAKEDEV.md @@ -1,6 +1,6 @@ define(MACHINE,alpha)dnl vers(__file__, - {-$OpenBSD: MAKEDEV.md,v 1.51 2010/11/19 20:55:46 miod Exp $-}, + {-$OpenBSD: MAKEDEV.md,v 1.52 2011/10/06 20:49:27 deraadt Exp $-}, etc.MACHINE)dnl dnl dnl Copyright (c) 2001-2006 Todd T. Fries @@ -24,7 +24,6 @@ _DEV(ramdisk) _DEV(std) _DEV(local) _TITLE(dis) -_DEV(ccd, 27, 7) _DEV(cd, 13, 3) _DEV(flo, 37, 4) _DEV(raid, 43, 16) @@ -128,6 +127,5 @@ target(all, rd, 0)dnl target(all, cd, 0, 1)dnl target(all, sd, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl target(all, vnd, 0, 1, 2, 3)dnl -target(all, ccd, 0, 1, 2, 3)dnl target(all, bthub, 0, 1, 2)dnl target(ramd, ttyB, 0, 1)dnl diff --git a/src/etc/etc.amd64/MAKEDEV.md b/src/etc/etc.amd64/MAKEDEV.md index 427e59d9..bc667e88 100644 --- a/src/etc/etc.amd64/MAKEDEV.md +++ b/src/etc/etc.amd64/MAKEDEV.md @@ -1,6 +1,6 @@ define(MACHINE,amd64)dnl vers(__file__, - {-$OpenBSD: MAKEDEV.md,v 1.44 2011/06/26 23:28:23 tedu Exp $-}, + {-$OpenBSD: MAKEDEV.md,v 1.45 2011/10/06 20:49:27 deraadt Exp $-}, etc.MACHINE)dnl dnl dnl Copyright (c) 2001-2006 Todd T. Fries @@ -30,7 +30,6 @@ _DEV(ramdisk) _DEV(std) _DEV(local) _TITLE(dis) -_DEV(ccd, 18, 16) _DEV(cd, 15, 6) _DEV(flo, 9, 2) _DEV(raid, 54, 19) @@ -136,7 +135,6 @@ target(all, rd, 0)dnl target(all, cd, 0, 1)dnl target(all, sd, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl target(all, vnd, 0, 1, 2, 3)dnl -target(all, ccd, 0, 1, 2, 3)dnl target(all, bktr, 0)dnl target(all, gpio, 0, 1, 2)dnl target(all, nvram)dnl diff --git a/src/etc/etc.armish/MAKEDEV.md b/src/etc/etc.armish/MAKEDEV.md index 6eea7427..a6011771 100644 --- a/src/etc/etc.armish/MAKEDEV.md +++ b/src/etc/etc.armish/MAKEDEV.md @@ -1,6 +1,6 @@ define(MACHINE,armish)dnl vers(__file__, - {-$OpenBSD: MAKEDEV.md,v 1.21 2010/09/30 15:27:54 claudio Exp $-}, + {-$OpenBSD: MAKEDEV.md,v 1.22 2011/10/06 20:49:27 deraadt Exp $-}, etc.MACHINE)dnl dnl dnl Copyright (c) 2001-2004 Todd T. Fries @@ -33,7 +33,6 @@ _DEV(ramdisk) _DEV(std) _DEV(local) _TITLE(dis) -_DEV(ccd, 21, 21) _DEV(cd, 26, 26) _DEV(ch, 27) _DEV(raid, 71, 71) @@ -121,5 +120,4 @@ target(all, rd, 0)dnl target(all, cd, 0, 1)dnl target(all, sd, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl target(all, vnd, 0, 1, 2, 3)dnl -target(all, ccd, 0, 1, 2, 3)dnl target(all, bthub, 0, 1, 2)dnl diff --git a/src/etc/etc.aviion/MAKEDEV.md b/src/etc/etc.aviion/MAKEDEV.md index 751b4165..32785a3c 100644 --- a/src/etc/etc.aviion/MAKEDEV.md +++ b/src/etc/etc.aviion/MAKEDEV.md @@ -1,6 +1,6 @@ define(MACHINE,aviion)dnl vers(__file__, - {-$OpenBSD: MAKEDEV.md,v 1.13 2010/09/30 15:27:54 claudio Exp $-}, + {-$OpenBSD: MAKEDEV.md,v 1.14 2011/10/06 20:49:27 deraadt Exp $-}, etc.MACHINE)dnl dnl dnl Copyright (c) 2001-2006 Todd T. Fries @@ -58,7 +58,6 @@ target(all, cd, 0, 1)dnl target(all, sd, 0, 1, 2, 3, 4)dnl target(all, uk, 0)dnl target(all, vnd, 0, 1, 2, 3)dnl -target(all, ccd, 0, 1, 2, 3)dnl twrget(all, dart, tty, a, b, c)dnl _DEV(all) dnl @@ -73,7 +72,6 @@ _DEV(std) _DEV(local) dnl _TITLE(dis) -_DEV(ccd, 17, 9) _DEV(cd, 9, 6) _DEV(rd, 18, 7) _DEV(sd, 8, 4) diff --git a/src/etc/etc.hp300/MAKEDEV.md b/src/etc/etc.hp300/MAKEDEV.md index e8fddd8a..0646477a 100644 --- a/src/etc/etc.hp300/MAKEDEV.md +++ b/src/etc/etc.hp300/MAKEDEV.md @@ -1,6 +1,6 @@ define(MACHINE,hp300)dnl vers(__file__, - {-$OpenBSD: MAKEDEV.md,v 1.42 2010/11/19 20:55:48 miod Exp $-}, + {-$OpenBSD: MAKEDEV.md,v 1.43 2011/10/06 20:49:27 deraadt Exp $-}, etc.MACHINE)dnl dnl dnl Copyright (c) 2001-2006 Todd T. Fries @@ -50,7 +50,6 @@ _DEV(ramdisk) _DEV(std) _DEV(local) _TITLE(dis) -_DEV(ccd, 17, 5) _DEV(cd, 18, 9) _DEV(hd, 9, 2) _DEV(rd, 34, 8) @@ -185,11 +184,10 @@ target(all, sd, 0, 1, 2, 3, 4)dnl target(all, st, 0, 1)dnl target(all, uk, 0)dnl target(all, vnd, 0, 1, 2, 3)dnl -target(all, ccd, 0, 1, 2, 3)dnl -target( all, dca, 0, 1)dnl -target( all, dcm, 0, 1, 2, 3)dnl -target( all, hd, 0, 1, 2)dnl -target( all, ct, 0, 1)dnl +target(all, dca, 0, 1)dnl +target(all, dcm, 0, 1, 2, 3)dnl +target(all, hd, 0, 1, 2)dnl +target(all, ct, 0, 1)dnl target(ramd, ct, 0, 1)dnl target(ramd, hd, 0, 1, 2)dnl target(ramd, pty, 0)dnl diff --git a/src/etc/etc.hppa/MAKEDEV.md b/src/etc/etc.hppa/MAKEDEV.md index 75bab0b4..ae9c7f7a 100644 --- a/src/etc/etc.hppa/MAKEDEV.md +++ b/src/etc/etc.hppa/MAKEDEV.md @@ -1,6 +1,6 @@ define(MACHINE,hppa)dnl vers(__file__, - {-$OpenBSD: MAKEDEV.md,v 1.45 2010/09/30 15:27:54 claudio Exp $-}, + {-$OpenBSD: MAKEDEV.md,v 1.46 2011/10/06 20:49:27 deraadt Exp $-}, etc.MACHINE)dnl dnl dnl Copyright (c) 2001-2006 Todd T. Fries @@ -24,7 +24,6 @@ _DEV(ramdisk) _DEV(std) _DEV(local) _TITLE(dis) -_DEV(ccd, 7, 1) _DEV(cd, 12, 6) _DEV(flo, 24, 7) _DEV(sd, 10, 4) @@ -109,7 +108,6 @@ target(all, rd, 0)dnl target(all, cd, 0, 1)dnl target(all, sd, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl target(all, vnd, 0, 1, 2, 3)dnl -target(all, ccd, 0, 1, 2, 3)dnl target(all, bthub, 0, 1, 2)dnl target(ramd, pty, 0)dnl target(ramd, hil)dnl diff --git a/src/etc/etc.hppa64/MAKEDEV.md b/src/etc/etc.hppa64/MAKEDEV.md index 37545391..6185aeff 100644 --- a/src/etc/etc.hppa64/MAKEDEV.md +++ b/src/etc/etc.hppa64/MAKEDEV.md @@ -1,6 +1,6 @@ define(MACHINE,hppa64)dnl vers(__file__, - {-$OpenBSD: MAKEDEV.md,v 1.22 2010/11/19 20:55:48 miod Exp $-}, + {-$OpenBSD: MAKEDEV.md,v 1.23 2011/10/06 20:49:27 deraadt Exp $-}, etc.MACHINE)dnl dnl dnl Copyright (c) 2001-2006 Todd T. Fries @@ -24,7 +24,6 @@ _DEV(ramdisk) _DEV(std) _DEV(local) _TITLE(dis) -_DEV(ccd, 7, 1) _DEV(cd, 12, 6) _DEV(flo, 24, 7) _DEV(sd, 10, 4) @@ -107,7 +106,6 @@ target(all, rd, 0)dnl target(all, cd, 0, 1)dnl target(all, sd, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl target(all, vnd, 0, 1, 2, 3)dnl -target(all, ccd, 0, 1, 2, 3)dnl target(ramd, pty, 0)dnl target(ramd, hil)dnl target(ramd, tun, 0, 1)dnl diff --git a/src/etc/etc.i386/MAKEDEV.md b/src/etc/etc.i386/MAKEDEV.md index 254efd43..996e9328 100644 --- a/src/etc/etc.i386/MAKEDEV.md +++ b/src/etc/etc.i386/MAKEDEV.md @@ -1,6 +1,6 @@ define(MACHINE,i386)dnl vers(__file__, - {-$OpenBSD: MAKEDEV.md,v 1.59 2011/06/26 23:28:23 tedu Exp $-}, + {-$OpenBSD: MAKEDEV.md,v 1.60 2011/10/06 20:49:27 deraadt Exp $-}, etc.MACHINE)dnl dnl dnl Copyright (c) 2001-2006 Todd T. Fries @@ -32,7 +32,6 @@ _DEV(ramdisk) _DEV(std) _DEV(local) _TITLE(dis) -_DEV(ccd, 18, 16) _DEV(cd, 15, 6) _DEV(flo, 9, 2) _DEV(raid, 54, 19) @@ -139,7 +138,6 @@ target(all, rd, 0)dnl target(all, cd, 0, 1)dnl target(all, sd, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl target(all, vnd, 0, 1, 2, 3)dnl -target(all, ccd, 0, 1, 2, 3)dnl target(all, bktr, 0)dnl target(all, gpio, 0, 1, 2)dnl target(all, nvram)dnl diff --git a/src/etc/etc.landisk/MAKEDEV.md b/src/etc/etc.landisk/MAKEDEV.md index 0f86519e..a053e192 100644 --- a/src/etc/etc.landisk/MAKEDEV.md +++ b/src/etc/etc.landisk/MAKEDEV.md @@ -1,6 +1,6 @@ define(MACHINE,landisk)dnl vers(__file__, - {-$OpenBSD: MAKEDEV.md,v 1.23 2010/09/30 15:27:54 claudio Exp $-}, + {-$OpenBSD: MAKEDEV.md,v 1.24 2011/10/06 20:49:27 deraadt Exp $-}, etc.MACHINE)dnl dnl dnl Copyright (c) 2001-2004 Todd T. Fries @@ -39,7 +39,6 @@ _DEV(ramdisk) _DEV(std) _DEV(local) _TITLE(dis) -_DEV(ccd, 21, 21) _DEV(cd, 26, 26) _DEV(ch, 27) _DEV(raid, 71, 71) @@ -126,5 +125,4 @@ target(all, rd, 0)dnl target(all, cd, 0, 1)dnl target(all, sd, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl target(all, vnd, 0, 1, 2, 3)dnl -target(all, ccd, 0, 1, 2, 3)dnl target(all, bthub, 0, 1, 2)dnl diff --git a/src/etc/etc.loongson/MAKEDEV.md b/src/etc/etc.loongson/MAKEDEV.md index f3df7a28..762e5268 100644 --- a/src/etc/etc.loongson/MAKEDEV.md +++ b/src/etc/etc.loongson/MAKEDEV.md @@ -1,6 +1,6 @@ define(MACHINE,loongson)dnl vers(__file__, - {-$OpenBSD: MAKEDEV.md,v 1.10 2010/11/19 20:55:48 miod Exp $-}, + {-$OpenBSD: MAKEDEV.md,v 1.11 2011/10/06 20:49:27 deraadt Exp $-}, etc.MACHINE)dnl dnl dnl Copyright (c) 2001-2006 Todd T. Fries @@ -33,7 +33,6 @@ _DEV(ramd) _DEV(std) _DEV(local) _TITLE(dis) -_DEV(ccd, 23, 6) _DEV(cd, 8, 3) _DEV(rd, 22, 8) _DEV(sd, 9, 0) @@ -108,7 +107,6 @@ target(all, rd, 0)dnl target(all, cd, 0, 1)dnl target(all, sd, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl target(all, vnd, 0, 1, 2, 3)dnl -target(all, ccd, 0, 1, 2, 3)dnl target(all, bthub, 0, 1, 2)dnl target(ramd, pty, 0)dnl target(ramd, bio)dnl diff --git a/src/etc/etc.luna88k/MAKEDEV.md b/src/etc/etc.luna88k/MAKEDEV.md index d9e7190e..5e5aa686 100644 --- a/src/etc/etc.luna88k/MAKEDEV.md +++ b/src/etc/etc.luna88k/MAKEDEV.md @@ -1,6 +1,6 @@ define(MACHINE,luna88k)dnl vers(__file__, - {-$OpenBSD: MAKEDEV.md,v 1.17 2010/09/30 15:27:54 claudio Exp $-}, + {-$OpenBSD: MAKEDEV.md,v 1.18 2011/10/06 20:49:27 deraadt Exp $-}, etc.MACHINE)dnl dnl dnl Copyright (c) 2001-2006 Todd T. Fries @@ -48,7 +48,6 @@ target(all, cd, 0, 1)dnl target(all, sd, 0, 1, 2, 3, 4)dnl target(all, uk, 0)dnl target(all, vnd, 0, 1, 2, 3)dnl -target(all, ccd, 0, 1, 2, 3)dnl twrget(all, sio, tty, a)dnl twrget(all, lcd, lcd)dnl _DEV(all) @@ -65,7 +64,6 @@ _DEV(std) _DEV(local) dnl _TITLE(dis) -_DEV(ccd, 17, 9) _DEV(cd, 9, 6) _DEV(rd, 18, 7) _DEV(sd, 8, 4) diff --git a/src/etc/etc.mac68k/MAKEDEV.md b/src/etc/etc.mac68k/MAKEDEV.md index bb689228..cd044303 100644 --- a/src/etc/etc.mac68k/MAKEDEV.md +++ b/src/etc/etc.mac68k/MAKEDEV.md @@ -1,6 +1,6 @@ define(MACHINE,mac68k)dnl vers(__file__, - {-$OpenBSD: MAKEDEV.md,v 1.35 2010/09/30 15:27:54 claudio Exp $-}, + {-$OpenBSD: MAKEDEV.md,v 1.36 2011/10/06 20:49:27 deraadt Exp $-}, etc.MACHINE)dnl dnl dnl Copyright (c) 2001-2006 Todd T. Fries @@ -28,7 +28,6 @@ _DEV(ramd) _DEV(std) _DEV(local) _TITLE(dis) -_DEV(ccd, 20, 9) _DEV(cd, 15, 6) _DEV(rd, 18, 13) _DEV(sd, 13, 4) @@ -114,7 +113,6 @@ target(all, tun, 0, 1, 2, 3)dnl target(all, xy, 0, 1, 2, 3)dnl target(all, rd, 0)dnl target(all, cd, 0, 1)dnl -target(all, ccd, 0, 1, 2, 3)dnl target(ramd, asc, 0)dnl twrget(ramd, mac_tty0, tty0, 0, 1)dnl target(ramd, pty, 0)dnl diff --git a/src/etc/etc.macppc/MAKEDEV.md b/src/etc/etc.macppc/MAKEDEV.md index 027b7677..e4632b03 100644 --- a/src/etc/etc.macppc/MAKEDEV.md +++ b/src/etc/etc.macppc/MAKEDEV.md @@ -1,6 +1,6 @@ define(MACHINE,macppc)dnl vers(__file__, - {-$OpenBSD: MAKEDEV.md,v 1.46 2011/04/19 23:07:55 todd Exp $-}, + {-$OpenBSD: MAKEDEV.md,v 1.47 2011/10/06 20:49:27 deraadt Exp $-}, etc.MACHINE)dnl dnl dnl Copyright (c) 2001-2006 Todd T. Fries @@ -41,7 +41,6 @@ _DEV(ramd) _DEV(std) _DEV(local) _TITLE(dis) -_DEV(ccd, 18, 16) _DEV(cd, 9, 3) _DEV(raid, 54, 19) _DEV(rd, 17, 17) @@ -130,7 +129,6 @@ target(all, rd, 0)dnl target(all, cd, 0, 1)dnl target(all, sd, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl target(all, vnd, 0, 1, 2, 3)dnl -target(all, ccd, 0, 1, 2, 3)dnl target(all, gpio, 0, 1, 2)dnl target(all, bio)dnl target(all, bthub, 0, 1, 2)dnl diff --git a/src/etc/etc.mvme68k/MAKEDEV.md b/src/etc/etc.mvme68k/MAKEDEV.md index df1149d7..f0797e3c 100644 --- a/src/etc/etc.mvme68k/MAKEDEV.md +++ b/src/etc/etc.mvme68k/MAKEDEV.md @@ -1,6 +1,6 @@ define(MACHINE,mvme68k)dnl vers(__file__, - {-$OpenBSD: MAKEDEV.md,v 1.30 2010/09/30 15:27:54 claudio Exp $-}, + {-$OpenBSD: MAKEDEV.md,v 1.31 2011/10/06 20:49:27 deraadt Exp $-}, etc.MACHINE)dnl dnl dnl Copyright (c) 2001-2006 Todd T. Fries @@ -117,7 +117,6 @@ target(all, cd, 0, 1)dnl target(all, sd, 0, 1, 2, 3, 4)dnl target(all, uk, 0)dnl target(all, vnd, 0, 1, 2, 3)dnl -target(all, ccd, 0, 1, 2, 3)dnl twrget(all, mvme_tzs, tty, a, b, c, d)dnl twrget(all, mvme_czs, cua, a, b, c, d)dnl twrget(all, cl, tty0, 0, 1, 2, 3)dnl @@ -138,7 +137,6 @@ _DEV(std) _DEV(local) dnl _TITLE(dis) -_DEV(ccd, 17, 5) _DEV(cd, 9, 8) _DEV(rd, 18, 9) _DEV(sd, 8, 4) diff --git a/src/etc/etc.mvme88k/MAKEDEV.md b/src/etc/etc.mvme88k/MAKEDEV.md index ef735c5c..46fb7de4 100644 --- a/src/etc/etc.mvme88k/MAKEDEV.md +++ b/src/etc/etc.mvme88k/MAKEDEV.md @@ -1,6 +1,6 @@ define(MACHINE,mvme88k)dnl vers(__file__, - {-$OpenBSD: MAKEDEV.md,v 1.29 2010/09/30 15:27:54 claudio Exp $-}, + {-$OpenBSD: MAKEDEV.md,v 1.30 2011/10/06 20:49:27 deraadt Exp $-}, etc.MACHINE)dnl dnl dnl Copyright (c) 2001-2006 Todd T. Fries @@ -84,7 +84,6 @@ target(all, cd, 0, 1)dnl target(all, sd, 0, 1, 2, 3, 4)dnl target(all, uk, 0)dnl target(all, vnd, 0, 1, 2, 3)dnl -target(all, ccd, 0, 1, 2, 3)dnl twrget(all, dart, tty, a, b)dnl twrget(all, cl, tty0, 0, 1, 2, 3, 4, 5, 6, 7)dnl twrget(all, vx, ttyv, 0, 1, 2, 3, 4, 5, 6, 7)dnl @@ -103,7 +102,6 @@ _DEV(std) _DEV(local) dnl _TITLE(dis) -_DEV(ccd, 17, 9) _DEV(cd, 9, 6) _DEV(rd, 18, 7) _DEV(sd, 8, 4) diff --git a/src/etc/etc.palm/MAKEDEV.md b/src/etc/etc.palm/MAKEDEV.md index e9f9064c..d327612c 100644 --- a/src/etc/etc.palm/MAKEDEV.md +++ b/src/etc/etc.palm/MAKEDEV.md @@ -1,6 +1,6 @@ define(MACHINE,palm)dnl vers(__file__, - {-$OpenBSD: MAKEDEV.md,v 1.8 2010/09/30 15:27:54 claudio Exp $-}, + {-$OpenBSD: MAKEDEV.md,v 1.9 2011/10/06 20:49:27 deraadt Exp $-}, etc.MACHINE)dnl dnl dnl Copyright (c) 2001-2004 Todd T. Fries @@ -33,7 +33,6 @@ _DEV(ramdisk) _DEV(std) _DEV(local) _TITLE(dis) -_DEV(ccd, 21, 21) _DEV(cd, 26, 26) _DEV(ch, 27) _DEV(raid, 71, 71) @@ -118,6 +117,5 @@ target(all, rd, 0)dnl target(all, cd, 0, 1)dnl target(all, sd, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl target(all, vnd, 0, 1, 2, 3)dnl -target(all, ccd, 0, 1, 2, 3)dnl target(all, ttyC, 0, 1)dnl target(all, bthub, 0, 1, 2)dnl diff --git a/src/etc/etc.sgi/MAKEDEV.md b/src/etc/etc.sgi/MAKEDEV.md index 93bfbdce..c62232d4 100644 --- a/src/etc/etc.sgi/MAKEDEV.md +++ b/src/etc/etc.sgi/MAKEDEV.md @@ -1,6 +1,6 @@ define(MACHINE,sgi)dnl vers(__file__, - {-$OpenBSD: MAKEDEV.md,v 1.33 2010/11/19 20:55:48 miod Exp $-}, + {-$OpenBSD: MAKEDEV.md,v 1.34 2011/10/06 20:49:27 deraadt Exp $-}, etc.MACHINE)dnl dnl dnl Copyright (c) 2001-2006 Todd T. Fries @@ -32,7 +32,6 @@ _DEV(ramd) _DEV(std) _DEV(local) _TITLE(dis) -_DEV(ccd, 23, 6) _DEV(cd, 8, 3) _DEV(rd, 22, 8) _DEV(sd, 9, 0) @@ -104,7 +103,6 @@ target(all, rd, 0)dnl target(all, cd, 0, 1)dnl target(all, sd, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl target(all, vnd, 0, 1, 2, 3)dnl -target(all, ccd, 0, 1, 2, 3)dnl twrget(wscons, wscons, ttyD, cfg, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, a, b)dnl twrget(wscons, wscons, ttyE, cfg, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, a, b)dnl twrget(wscons, wscons, ttyF, cfg, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, a, b)dnl diff --git a/src/etc/etc.socppc/MAKEDEV.md b/src/etc/etc.socppc/MAKEDEV.md index cd0031b8..71e61e9c 100644 --- a/src/etc/etc.socppc/MAKEDEV.md +++ b/src/etc/etc.socppc/MAKEDEV.md @@ -1,6 +1,6 @@ define(MACHINE,socppc)dnl vers(__file__, - {-$OpenBSD: MAKEDEV.md,v 1.14 2011/07/29 17:54:09 kettenis Exp $-}, + {-$OpenBSD: MAKEDEV.md,v 1.15 2011/10/06 20:49:27 deraadt Exp $-}, etc.MACHINE)dnl dnl dnl Copyright (c) 2001-2006 Todd T. Fries @@ -25,7 +25,6 @@ _DEV(ramd) _DEV(std) _DEV(local) _TITLE(dis) -_DEV(ccd, 18, 16) _DEV(cd, 9, 3) _DEV(raid, 54, 19) _DEV(rd, 17, 17) @@ -103,7 +102,6 @@ target(all, rd, 0)dnl target(all, cd, 0, 1)dnl target(all, sd, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl target(all, vnd, 0, 1, 2, 3)dnl -target(all, ccd, 0, 1, 2, 3)dnl dnl target(all, gpio, 0, 1, 2)dnl dnl target(all, bio)dnl target(all, bthub, 0, 1, 2)dnl diff --git a/src/etc/etc.sparc/MAKEDEV.md b/src/etc/etc.sparc/MAKEDEV.md index 1926ce4d..5fc06a8f 100644 --- a/src/etc/etc.sparc/MAKEDEV.md +++ b/src/etc/etc.sparc/MAKEDEV.md @@ -1,6 +1,6 @@ define(MACHINE,sparc)dnl vers(__file__, - {-$OpenBSD: MAKEDEV.md,v 1.46 2010/11/19 20:55:48 miod Exp $-}, + {-$OpenBSD: MAKEDEV.md,v 1.47 2011/10/06 20:49:27 deraadt Exp $-}, etc.MACHINE)dnl dnl dnl Copyright (c) 2001-2006 Todd T. Fries @@ -57,7 +57,6 @@ _DEV(ramdisk) _DEV(std) _DEV(local) _TITLE(dis) -_DEV(ccd, 23, 9) _DEV(cd, 58, 18) _DEV(flo, 54, 16) _DEV(presto, 25, 26) @@ -141,7 +140,6 @@ target(all, rd, 0)dnl target(all, cd, 0, 1)dnl target(all, sd, 0, 1, 2, 3, 4)dnl target(all, vnd, 0, 1, 2, 3)dnl -target(all, ccd, 0, 1, 2, 3)dnl target(all, bpp, 0)dnl target(all, presto, 0)dnl twrget(wscons, wscons, ttyD, cfg, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, a, b)dnl diff --git a/src/etc/etc.sparc64/MAKEDEV.md b/src/etc/etc.sparc64/MAKEDEV.md index d921ffcc..a8ad83e8 100644 --- a/src/etc/etc.sparc64/MAKEDEV.md +++ b/src/etc/etc.sparc64/MAKEDEV.md @@ -1,6 +1,6 @@ define(MACHINE,sparc64)dnl vers(__file__, - {-$OpenBSD: MAKEDEV.md,v 1.62 2010/10/08 18:21:34 ratchov Exp $-}, + {-$OpenBSD: MAKEDEV.md,v 1.63 2011/10/06 20:49:27 deraadt Exp $-}, etc.MACHINE)dnl dnl dnl Copyright (c) 2001-2006 Todd T. Fries @@ -52,7 +52,6 @@ _DEV(ramdisk) _DEV(std) _DEV(local) _TITLE(dis) -_DEV(ccd, 23, 9) _DEV(cd, 58, 18) _DEV(flo, 54, 16) _DEV(raid, 121, 25) @@ -143,7 +142,6 @@ twrget(wscons, wscons, ttyG, cfg, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, a, b)dnl twrget(wscons, wscons, ttyH, cfg, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, a, b)dnl twrget(wscons, wscons, ttyI, cfg, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, a, b)dnl twrget(wscons, wscons, ttyJ, cfg, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, a, b)dnl -target(all, ccd, 0, 1, 2, 3)dnl target(all, ch, 0)dnl target(all, nnpfs, 0)dnl target(all, vscsi, 0)dnl diff --git a/src/etc/etc.vax/MAKEDEV.md b/src/etc/etc.vax/MAKEDEV.md index d59063bd..bf13032c 100644 --- a/src/etc/etc.vax/MAKEDEV.md +++ b/src/etc/etc.vax/MAKEDEV.md @@ -1,6 +1,6 @@ define(MACHINE,vax)dnl vers(__file__, - {-$OpenBSD: MAKEDEV.md,v 1.45 2011/09/03 20:45:17 miod Exp $-}, + {-$OpenBSD: MAKEDEV.md,v 1.46 2011/10/06 20:49:27 deraadt Exp $-}, etc.MACHINE)dnl dnl dnl Copyright (c) 2001-2006 Todd T. Fries @@ -89,7 +89,6 @@ _DEV(ramdisk) _DEV(std) _DEV(local) _TITLE(dis) -_DEV(ccd, 54, 17) _DEV(cd, 61, 22) _DEV(hd, 58, 19) _DEV(ra, 9, 9) @@ -189,11 +188,10 @@ dnl target(all, rd, 0)dnl target(all, cd, 0)dnl target(all, sd, 0, 1, 2, 3)dnl target(all, vnd, 0)dnl -target( all, ccd, 0)dnl -target( all, hd, 0, 1, 2)dnl -target( all, mt, 0, 1)dnl -target( all, st, 0, 1)dnl -target( all, dhu, 0)dnl -target( all, dz, 0)dnl -target( all, dl, 0)dnl -target( all, qsc, 0)dnl +target(all, hd, 0, 1, 2)dnl +target(all, mt, 0, 1)dnl +target(all, st, 0, 1)dnl +target(all, dhu, 0)dnl +target(all, dz, 0)dnl +target(all, dl, 0)dnl +target(all, qsc, 0)dnl diff --git a/src/etc/etc.zaurus/MAKEDEV.md b/src/etc/etc.zaurus/MAKEDEV.md index ccba9bb2..6b4c2289 100644 --- a/src/etc/etc.zaurus/MAKEDEV.md +++ b/src/etc/etc.zaurus/MAKEDEV.md @@ -1,6 +1,6 @@ define(MACHINE,zaurus)dnl vers(__file__, - {-$OpenBSD: MAKEDEV.md,v 1.28 2010/09/30 15:27:54 claudio Exp $-}, + {-$OpenBSD: MAKEDEV.md,v 1.29 2011/10/06 20:49:27 deraadt Exp $-}, etc.MACHINE)dnl dnl dnl Copyright (c) 2001-2004 Todd T. Fries @@ -33,7 +33,6 @@ _DEV(ramdisk) _DEV(std) _DEV(local) _TITLE(dis) -_DEV(ccd, 21, 21) _DEV(cd, 26, 26) _DEV(ch, 27) _DEV(raid, 71, 71) @@ -119,6 +118,5 @@ target(all, rd, 0)dnl target(all, cd, 0, 1)dnl target(all, sd, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl target(all, vnd, 0, 1, 2, 3)dnl -target(all, ccd, 0, 1, 2, 3)dnl target(all, ttyC, 0, 1)dnl target(all, bthub, 0, 1, 2)dnl diff --git a/src/etc/rc b/src/etc/rc index 61a580a8..0a4ea56d 100644 --- a/src/etc/rc +++ b/src/etc/rc @@ -1,4 +1,4 @@ -# $OpenBSD: rc,v 1.393 2011/09/16 10:11:20 robert Exp $ +# $OpenBSD: rc,v 1.394 2011/10/06 20:49:25 deraadt Exp $ # System startup script run by init on autoboot # or after single-user. @@ -259,11 +259,6 @@ if [ X"$1" = X"shutdown" ]; then exit 0 fi -# Configure ccd devices. -if [ -f /etc/ccd.conf ]; then - ccdconfig -C -fi - # Configure raid devices. for dev in 0 1 2 3; do if [ -f /etc/raid$dev.conf ]; then