Fincer
/
openntpd-openbsd
mirror of https://github.com/Fincer/openntpd-openbsd
1
0
Fork 0
Code Issues 0 Projects 0 Releases 61 Wiki Activity
Browse Source

ccd goes to the attic 

discussed with jsing and millert
OPENBSD_5_1
deraadt 13 years ago
parent
7f73468da7
commit
a26d8773fe
27 changed files with 38 additions and 95 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +1
    -3
      src/etc/MAKEDEV.common
  2. +2
    -2
      src/etc/Makefile
  3. +0
    -5
      src/etc/ccd.conf
  4. +1
    -2
      src/etc/changelist
  5. +1
    -3
      src/etc/etc.alpha/MAKEDEV.md
  6. +1
    -3
      src/etc/etc.amd64/MAKEDEV.md
  7. +1
    -3
      src/etc/etc.armish/MAKEDEV.md
  8. +1
    -3
      src/etc/etc.aviion/MAKEDEV.md
  9. +5
    -7
      src/etc/etc.hp300/MAKEDEV.md
  10. +1
    -3
      src/etc/etc.hppa/MAKEDEV.md
  11. +1
    -3
      src/etc/etc.hppa64/MAKEDEV.md
  12. +1
    -3
      src/etc/etc.i386/MAKEDEV.md
  13. +1
    -3
      src/etc/etc.landisk/MAKEDEV.md
  14. +1
    -3
      src/etc/etc.loongson/MAKEDEV.md
  15. +1
    -3
      src/etc/etc.luna88k/MAKEDEV.md
  16. +1
    -3
      src/etc/etc.mac68k/MAKEDEV.md
  17. +1
    -3
      src/etc/etc.macppc/MAKEDEV.md
  18. +1
    -3
      src/etc/etc.mvme68k/MAKEDEV.md
  19. +1
    -3
      src/etc/etc.mvme88k/MAKEDEV.md
  20. +1
    -3
      src/etc/etc.palm/MAKEDEV.md
  21. +1
    -3
      src/etc/etc.sgi/MAKEDEV.md
  22. +1
    -3
      src/etc/etc.socppc/MAKEDEV.md
  23. +1
    -3
      src/etc/etc.sparc/MAKEDEV.md
  24. +1
    -3
      src/etc/etc.sparc64/MAKEDEV.md
  25. +8
    -10
      src/etc/etc.vax/MAKEDEV.md
  26. +1
    -3
      src/etc/etc.zaurus/MAKEDEV.md
  27. +1
    -6
      src/etc/rc

+ 1
- 3
src/etc/MAKEDEV.common View File

@ -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 <todd@OpenBSD.org>
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


+ 2
- 2
src/etc/Makefile View File

@ -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 \


+ 0
- 5
src/etc/ccd.conf View File

@ -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

+ 1
- 2
src/etc/changelist View File

@ -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


+ 1
- 3
src/etc/etc.alpha/MAKEDEV.md View File

@ -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 <todd@OpenBSD.org>
@ -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

+ 1
- 3
src/etc/etc.amd64/MAKEDEV.md View File

@ -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 <todd@OpenBSD.org>
@ -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


+ 1
- 3
src/etc/etc.armish/MAKEDEV.md View File

@ -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 <todd@OpenBSD.org>
@ -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

+ 1
- 3
src/etc/etc.aviion/MAKEDEV.md View File

@ -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 <todd@OpenBSD.org>
@ -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)


+ 5
- 7
src/etc/etc.hp300/MAKEDEV.md View File

@ -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 <todd@OpenBSD.org>
@ -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


+ 1
- 3
src/etc/etc.hppa/MAKEDEV.md View File

@ -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 <todd@OpenBSD.org>
@ -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


+ 1
- 3
src/etc/etc.hppa64/MAKEDEV.md View File

@ -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 <todd@OpenBSD.org>
@ -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

+ 1
- 3
src/etc/etc.i386/MAKEDEV.md View File

@ -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 <todd@OpenBSD.org>
@ -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


+ 1
- 3
src/etc/etc.landisk/MAKEDEV.md View File

@ -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 <todd@OpenBSD.org>
@ -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

+ 1
- 3
src/etc/etc.loongson/MAKEDEV.md View File

@ -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 <todd@OpenBSD.org>
@ -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


+ 1
- 3
src/etc/etc.luna88k/MAKEDEV.md View File

@ -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 <todd@OpenBSD.org>
@ -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)


+ 1
- 3
src/etc/etc.mac68k/MAKEDEV.md View File

@ -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 <todd@OpenBSD.org>
@ -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


+ 1
- 3
src/etc/etc.macppc/MAKEDEV.md View File

@ -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 <todd@OpenBSD.org>
@ -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


+ 1
- 3
src/etc/etc.mvme68k/MAKEDEV.md View File

@ -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 <todd@OpenBSD.org>
@ -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)


+ 1
- 3
src/etc/etc.mvme88k/MAKEDEV.md View File

@ -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 <todd@OpenBSD.org>
@ -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)


+ 1
- 3
src/etc/etc.palm/MAKEDEV.md View File

@ -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 <todd@OpenBSD.org>
@ -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

+ 1
- 3
src/etc/etc.sgi/MAKEDEV.md View File

@ -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 <todd@OpenBSD.org>
@ -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


+ 1
- 3
src/etc/etc.socppc/MAKEDEV.md View File

@ -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 <todd@OpenBSD.org>
@ -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


+ 1
- 3
src/etc/etc.sparc/MAKEDEV.md View File

@ -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 <todd@OpenBSD.org>
@ -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


+ 1
- 3
src/etc/etc.sparc64/MAKEDEV.md View File

@ -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 <todd@OpenBSD.org>
@ -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


+ 8
- 10
src/etc/etc.vax/MAKEDEV.md View File

@ -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 <todd@OpenBSD.org>
@ -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

+ 1
- 3
src/etc/etc.zaurus/MAKEDEV.md View File

@ -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 <todd@OpenBSD.org>
@ -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

+ 1
- 6
src/etc/rc View File

@ -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


Write Preview
Loading…
Cancel
Save