From 5ed886d791ff2bd1b5a2afb0a9733b5531172634 Mon Sep 17 00:00:00 2001 From: deraadt <> Date: Thu, 6 Oct 2011 20:50:54 +0000 Subject: [PATCH] sync --- src/etc/etc.alpha/MAKEDEV | 36 +++++++++++++++++------------------- src/etc/etc.amd64/MAKEDEV | 35 ++++++++++++++++------------------- src/etc/etc.armish/MAKEDEV | 30 ++++++++++++++---------------- src/etc/etc.aviion/MAKEDEV | 17 +++++++---------- src/etc/etc.hp300/MAKEDEV | 19 ++++++++----------- src/etc/etc.hppa/MAKEDEV | 30 ++++++++++++++---------------- src/etc/etc.hppa64/MAKEDEV | 24 +++++++++++------------- src/etc/etc.i386/MAKEDEV | 36 +++++++++++++++++------------------- src/etc/etc.landisk/MAKEDEV | 29 +++++++++++++---------------- src/etc/etc.loongson/MAKEDEV | 22 ++++++++++------------ src/etc/etc.luna88k/MAKEDEV | 17 +++++++---------- src/etc/etc.mac68k/MAKEDEV | 17 +++++++---------- src/etc/etc.macppc/MAKEDEV | 31 ++++++++++++++----------------- src/etc/etc.mvme68k/MAKEDEV | 19 ++++++++----------- src/etc/etc.mvme88k/MAKEDEV | 19 ++++++++----------- src/etc/etc.palm/MAKEDEV | 29 +++++++++++++---------------- src/etc/etc.sgi/MAKEDEV | 22 ++++++++++------------ src/etc/etc.socppc/MAKEDEV | 21 +++++++++------------ src/etc/etc.sparc/MAKEDEV | 29 +++++++++++++---------------- src/etc/etc.sparc64/MAKEDEV | 22 ++++++++++------------ src/etc/etc.vax/MAKEDEV | 14 ++++++-------- src/etc/etc.zaurus/MAKEDEV | 29 +++++++++++++---------------- 22 files changed, 245 insertions(+), 302 deletions(-) diff --git a/src/etc/etc.alpha/MAKEDEV b/src/etc/etc.alpha/MAKEDEV index 0bb999b7..cefdf5ed 100644 --- a/src/etc/etc.alpha/MAKEDEV +++ b/src/etc/etc.alpha/MAKEDEV @@ -3,8 +3,8 @@ # THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. # generated from: # -# OpenBSD: etc.alpha/MAKEDEV.md,v 1.51 2010/11/19 20:55:46 miod Exp -# OpenBSD: MAKEDEV.common,v 1.54 2011/04/18 16:52:10 thib Exp +# OpenBSD: etc.alpha/MAKEDEV.md,v 1.52 2011/10/06 20:49:27 deraadt Exp +# OpenBSD: MAKEDEV.common,v 1.57 2011/10/06 20:49:25 deraadt Exp # OpenBSD: MAKEDEV.mi,v 1.80 2011/04/18 16:52:10 thib Exp # OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp # @@ -30,7 +30,6 @@ # std Standard devices # local Configuration specific devices # Disks: -# ccd* Concatenated disk devices # cd* ATAPI and SCSI CD-ROM drives # fd* Floppy disk drives (3 1/2", 5 1/4") # raid* RAIDframe disk devices @@ -556,26 +555,25 @@ local) ;; all) - R bthub0 bthub1 bthub2 ccd0 ccd1 ccd2 ccd3 vnd0 vnd1 vnd2 - R vnd3 sd0 sd1 sd2 sd3 sd4 sd5 sd6 sd7 sd8 sd9 cd0 cd1 rd0 - R tun0 tun1 tun2 tun3 bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 - R bpf8 bpf9 pty0 fd1 fd1B fd1C fd1D fd1E fd1F fd1G fd1H fd0 - R fd0B fd0C fd0D fd0E fd0F fd0G fd0H diskmap vscsi0 nnpfs0 ch0 - R bio hotplug ptm local wscons pci0 pci1 pci2 pci3 iop0 iop1 - R uall rmidi0 rmidi1 rmidi2 rmidi3 rmidi4 rmidi5 rmidi6 rmidi7 - R tuner0 radio0 music0 speaker video0 video1 audio0 audio1 - R audio2 uk0 random lpa0 lpa1 lpa2 lpt0 lpt1 lpt2 lkm tty00 - R tty01 tty02 tty03 ttyc0 ttyc1 ttyc2 ttyc3 ttyc4 ttyc5 ttyc6 - R ttyc7 ttyB0 ttyB1 ttyB2 ttyB3 ttyB4 ttyB5 crypto pf systrace - R wd0 wd1 wd2 wd3 raid0 raid1 raid2 raid3 std st0 st1 fd - ;; - -wd*|sd*|raid*|ccd*) + R bthub0 bthub1 bthub2 vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 + R sd4 sd5 sd6 sd7 sd8 sd9 cd0 cd1 rd0 tun0 tun1 tun2 tun3 bpf0 + R bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0 fd1 fd1B + R fd1C fd1D fd1E fd1F fd1G fd1H fd0 fd0B fd0C fd0D fd0E fd0F + R fd0G fd0H diskmap vscsi0 nnpfs0 ch0 bio hotplug ptm local + R wscons pci0 pci1 pci2 pci3 iop0 iop1 uall rmidi0 rmidi1 + R rmidi2 rmidi3 rmidi4 rmidi5 rmidi6 rmidi7 tuner0 radio0 + R music0 speaker video0 video1 audio0 audio1 audio2 uk0 random + R lpa0 lpa1 lpa2 lpt0 lpt1 lpt2 lkm tty00 tty01 tty02 tty03 + R ttyc0 ttyc1 ttyc2 ttyc3 ttyc4 ttyc5 ttyc6 ttyc7 ttyB0 ttyB1 + R ttyB2 ttyB3 ttyB4 ttyB5 crypto pf systrace wd0 wd1 wd2 wd3 + R raid0 raid1 raid2 raid3 std st0 st1 fd + ;; + +wd*|sd*|raid*) case $i in wd*) dodisk wd $U 0 36 $U 0;; sd*) dodisk sd $U 8 8 $U 0;; raid*) dodisk raid $U 16 43 $U 0;; - ccd*) dodisk ccd $U 7 27 $U 0;; esac ;; diff --git a/src/etc/etc.amd64/MAKEDEV b/src/etc/etc.amd64/MAKEDEV index 2b8192ab..993b2264 100644 --- a/src/etc/etc.amd64/MAKEDEV +++ b/src/etc/etc.amd64/MAKEDEV @@ -3,8 +3,8 @@ # THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. # generated from: # -# OpenBSD: etc.amd64/MAKEDEV.md,v 1.44 2011/06/26 23:28:23 tedu Exp -# OpenBSD: MAKEDEV.common,v 1.55 2011/06/26 23:28:23 tedu Exp +# OpenBSD: etc.amd64/MAKEDEV.md,v 1.45 2011/10/06 20:49:27 deraadt Exp +# OpenBSD: MAKEDEV.common,v 1.57 2011/10/06 20:49:25 deraadt Exp # OpenBSD: MAKEDEV.mi,v 1.80 2011/04/18 16:52:10 thib Exp # OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp # @@ -30,7 +30,6 @@ # std Standard devices # local Configuration specific devices # Disks: -# ccd* Concatenated disk devices # cd* ATAPI and SCSI CD-ROM drives # fd* Floppy disk drives (3 1/2", 5 1/4") # raid* RAIDframe disk devices @@ -588,26 +587,24 @@ local) all) R drm0 agp0 bthub0 bthub1 bthub2 nvram gpio0 gpio1 gpio2 - R bktr0 ccd0 ccd1 ccd2 ccd3 vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 - R sd3 sd4 sd5 sd6 sd7 sd8 sd9 cd0 cd1 rd0 tun0 tun1 tun2 tun3 - R bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 bio pty0 - R fd1 fd1B fd1C fd1D fd1E fd1F fd1G fd1H fd0 fd0B fd0C fd0D - R fd0E fd0F fd0G fd0H diskmap vscsi0 nnpfs0 ch0 hotplug ptm - R gpr0 local wscons pci0 pci1 pci2 pci3 iop0 iop1 uall rmidi0 - R rmidi1 rmidi2 rmidi3 rmidi4 rmidi5 rmidi6 rmidi7 tuner0 - R radio0 music0 speaker video0 video1 audio0 audio1 audio2 uk0 - R random lpa0 lpa1 lpa2 lpt0 lpt1 lpt2 lkm tty00 tty01 tty02 - R tty03 ttyc0 ttyc1 ttyc2 ttyc3 ttyc4 ttyc5 ttyc6 ttyc7 apm - R crypto pf pctr systrace wd0 wd1 wd2 wd3 raid0 raid1 raid2 - R raid3 std st0 st1 fd - ;; - -wd*|sd*|raid*|ccd*) + R bktr0 vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4 sd5 sd6 sd7 + R sd8 sd9 cd0 cd1 rd0 tun0 tun1 tun2 tun3 bpf0 bpf1 bpf2 bpf3 + R bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 bio pty0 fd1 fd1B fd1C fd1D + R fd1E fd1F fd1G fd1H fd0 fd0B fd0C fd0D fd0E fd0F fd0G fd0H + R diskmap vscsi0 nnpfs0 ch0 hotplug ptm gpr0 local wscons pci0 + R pci1 pci2 pci3 iop0 iop1 uall rmidi0 rmidi1 rmidi2 rmidi3 + R rmidi4 rmidi5 rmidi6 rmidi7 tuner0 radio0 music0 speaker + R video0 video1 audio0 audio1 audio2 uk0 random lpa0 lpa1 lpa2 + R lpt0 lpt1 lpt2 lkm tty00 tty01 tty02 tty03 ttyc0 ttyc1 ttyc2 + R ttyc3 ttyc4 ttyc5 ttyc6 ttyc7 apm crypto pf pctr systrace + R wd0 wd1 wd2 wd3 raid0 raid1 raid2 raid3 std st0 st1 fd + ;; + +wd*|sd*|raid*) case $i in wd*) dodisk wd $U 0 3 $U 0;; sd*) dodisk sd $U 4 13 $U 0;; raid*) dodisk raid $U 19 54 $U 0;; - ccd*) dodisk ccd $U 16 18 $U 0;; esac ;; diff --git a/src/etc/etc.armish/MAKEDEV b/src/etc/etc.armish/MAKEDEV index a2d99374..ddeb337f 100644 --- a/src/etc/etc.armish/MAKEDEV +++ b/src/etc/etc.armish/MAKEDEV @@ -3,8 +3,8 @@ # THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. # generated from: # -# OpenBSD: etc.armish/MAKEDEV.md,v 1.21 2010/09/30 15:27:54 claudio Exp -# OpenBSD: MAKEDEV.common,v 1.54 2011/04/18 16:52:10 thib Exp +# OpenBSD: etc.armish/MAKEDEV.md,v 1.22 2011/10/06 20:49:27 deraadt Exp +# OpenBSD: MAKEDEV.common,v 1.57 2011/10/06 20:49:25 deraadt Exp # OpenBSD: MAKEDEV.mi,v 1.80 2011/04/18 16:52:10 thib Exp # OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp # @@ -30,7 +30,6 @@ # std Standard devices # local Configuration specific devices # Disks: -# ccd* Concatenated disk devices # cd* ATAPI and SCSI CD-ROM drives # ch* SCSI media changers # raid* RAIDframe disk devices @@ -501,23 +500,22 @@ local) ;; all) - R bthub0 bthub1 bthub2 ccd0 ccd1 ccd2 ccd3 vnd0 vnd1 vnd2 - R vnd3 sd0 sd1 sd2 sd3 sd4 sd5 sd6 sd7 sd8 sd9 cd0 cd1 rd0 - R tun0 tun1 tun2 tun3 bio bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 - R bpf7 bpf8 bpf9 pty0 diskmap vscsi0 nnpfs0 ch0 hotplug ptm - R local wscons pci0 pci1 pci2 pci3 iop0 iop1 uall rmidi0 - R rmidi1 rmidi2 rmidi3 rmidi4 rmidi5 rmidi6 rmidi7 tuner0 - R radio0 music0 video0 video1 audio0 audio1 audio2 uk0 random - R lkm tty00 tty01 tty02 tty03 apm crypto pf systrace wd0 wd1 - R wd2 wd3 raid0 raid1 raid2 raid3 std st0 st1 fd - ;; - -wd*|sd*|raid*|ccd*) + R bthub0 bthub1 bthub2 vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 + R sd4 sd5 sd6 sd7 sd8 sd9 cd0 cd1 rd0 tun0 tun1 tun2 tun3 bio + R bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0 + R diskmap vscsi0 nnpfs0 ch0 hotplug ptm local wscons pci0 pci1 + R pci2 pci3 iop0 iop1 uall rmidi0 rmidi1 rmidi2 rmidi3 rmidi4 + R rmidi5 rmidi6 rmidi7 tuner0 radio0 music0 video0 video1 + R audio0 audio1 audio2 uk0 random lkm tty00 tty01 tty02 tty03 + R apm crypto pf systrace wd0 wd1 wd2 wd3 raid0 raid1 raid2 + R raid3 std st0 st1 fd + ;; + +wd*|sd*|raid*) case $i in wd*) dodisk wd $U 16 16 $U 0;; sd*) dodisk sd $U 24 24 $U 0;; raid*) dodisk raid $U 71 71 $U 0;; - ccd*) dodisk ccd $U 21 21 $U 0;; esac ;; diff --git a/src/etc/etc.aviion/MAKEDEV b/src/etc/etc.aviion/MAKEDEV index a862fd74..c22c77ae 100644 --- a/src/etc/etc.aviion/MAKEDEV +++ b/src/etc/etc.aviion/MAKEDEV @@ -3,8 +3,8 @@ # THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. # generated from: # -# OpenBSD: etc.aviion/MAKEDEV.md,v 1.13 2010/09/30 15:27:54 claudio Exp -# OpenBSD: MAKEDEV.common,v 1.54 2011/04/18 16:52:10 thib Exp +# OpenBSD: etc.aviion/MAKEDEV.md,v 1.14 2011/10/06 20:49:27 deraadt Exp +# OpenBSD: MAKEDEV.common,v 1.57 2011/10/06 20:49:25 deraadt Exp # OpenBSD: MAKEDEV.mi,v 1.80 2011/04/18 16:52:10 thib Exp # OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp # @@ -30,7 +30,6 @@ # std Standard devices # local Configuration specific devices # Disks: -# ccd* Concatenated disk devices # cd* ATAPI and SCSI CD-ROM drives # rd* "rd" pseudo-disks # sd* SCSI disks, including flopticals @@ -340,17 +339,15 @@ ramdisk) ;; all) - R ttya ttyb ttyc ccd0 ccd1 ccd2 ccd3 vnd0 vnd1 vnd2 vnd3 sd0 - R sd1 sd2 sd3 sd4 cd0 cd1 rd0 tun0 tun1 tun2 tun3 bio bpf0 - R bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0 diskmap - R vscsi0 nnpfs0 ch0 nvram0 ptm local uk0 random lkm pf - R systrace std st0 st1 fd + R ttya ttyb ttyc vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4 cd0 + R cd1 rd0 tun0 tun1 tun2 tun3 bio bpf0 bpf1 bpf2 bpf3 bpf4 + R bpf5 bpf6 bpf7 bpf8 bpf9 pty0 diskmap vscsi0 nnpfs0 ch0 + R nvram0 ptm local uk0 random lkm pf systrace std st0 st1 fd ;; -sd*|ccd*) +sd*) case $i in sd*) dodisk sd $U 4 8 $U 0;; - ccd*) dodisk ccd $U 9 17 $U 0;; esac ;; diff --git a/src/etc/etc.hp300/MAKEDEV b/src/etc/etc.hp300/MAKEDEV index 98269e98..b09bf82b 100644 --- a/src/etc/etc.hp300/MAKEDEV +++ b/src/etc/etc.hp300/MAKEDEV @@ -3,8 +3,8 @@ # THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. # generated from: # -# OpenBSD: etc.hp300/MAKEDEV.md,v 1.42 2010/11/19 20:55:48 miod Exp -# OpenBSD: MAKEDEV.common,v 1.54 2011/04/18 16:52:10 thib Exp +# OpenBSD: etc.hp300/MAKEDEV.md,v 1.43 2011/10/06 20:49:27 deraadt Exp +# OpenBSD: MAKEDEV.common,v 1.57 2011/10/06 20:49:25 deraadt Exp # OpenBSD: MAKEDEV.mi,v 1.80 2011/04/18 16:52:10 thib Exp # OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp # @@ -30,7 +30,6 @@ # std Standard devices # local Configuration specific devices # Disks: -# ccd* Concatenated disk devices # cd* ATAPI and SCSI CD-ROM drives # hd* HP300 HP-IB disks # rd* "rd" pseudo-disks @@ -461,19 +460,17 @@ local) ;; all) - R ct0 ct1 hd0 hd1 hd2 dcm0 dcm1 dcm2 dcm3 dca0 dca1 ccd0 ccd1 - R ccd2 ccd3 vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4 cd0 cd1 - R rd0 tun0 tun1 tun2 tun3 bio bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 - R bpf6 bpf7 bpf8 bpf9 pty0 diskmap vscsi0 nnpfs0 ch0 hotplug - R ptm local ppi0 apci0 wscons uk0 random lkm pf systrace std - R st0 st1 fd + R ct0 ct1 hd0 hd1 hd2 dcm0 dcm1 dcm2 dcm3 dca0 dca1 vnd0 vnd1 + R vnd2 vnd3 sd0 sd1 sd2 sd3 sd4 cd0 cd1 rd0 tun0 tun1 tun2 + R tun3 bio bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 + R pty0 diskmap vscsi0 nnpfs0 ch0 hotplug ptm local ppi0 apci0 + R wscons uk0 random lkm pf systrace std st0 st1 fd ;; -sd*|hd*|ccd*) +sd*|hd*) case $i in sd*) dodisk sd $U 4 8 $U 0;; hd*) dodisk hd $U 2 9 $U 0;; - ccd*) dodisk ccd $U 5 17 $U 0;; esac ;; diff --git a/src/etc/etc.hppa/MAKEDEV b/src/etc/etc.hppa/MAKEDEV index f689fd7e..7b7e9473 100644 --- a/src/etc/etc.hppa/MAKEDEV +++ b/src/etc/etc.hppa/MAKEDEV @@ -3,8 +3,8 @@ # THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. # generated from: # -# OpenBSD: etc.hppa/MAKEDEV.md,v 1.45 2010/09/30 15:27:54 claudio Exp -# OpenBSD: MAKEDEV.common,v 1.54 2011/04/18 16:52:10 thib Exp +# OpenBSD: etc.hppa/MAKEDEV.md,v 1.46 2011/10/06 20:49:27 deraadt Exp +# OpenBSD: MAKEDEV.common,v 1.57 2011/10/06 20:49:25 deraadt Exp # OpenBSD: MAKEDEV.mi,v 1.80 2011/04/18 16:52:10 thib Exp # OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp # @@ -30,7 +30,6 @@ # std Standard devices # local Configuration specific devices # Disks: -# ccd* Concatenated disk devices # cd* ATAPI and SCSI CD-ROM drives # fd* Floppy disk drives (3 1/2", 5 1/4") # sd* SCSI disks, including flopticals @@ -504,22 +503,21 @@ local) ;; all) - R bthub0 bthub1 bthub2 ccd0 ccd1 ccd2 ccd3 vnd0 vnd1 vnd2 - R vnd3 sd0 sd1 sd2 sd3 sd4 sd5 sd6 sd7 sd8 sd9 cd0 cd1 rd0 - R tun0 tun1 tun2 tun3 bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 - R bpf8 bpf9 pty0 fd1 fd1B fd1C fd1D fd1E fd1F fd1G fd1H fd0 - R fd0B fd0C fd0D fd0E fd0F fd0G fd0H diskmap vscsi0 nnpfs0 bio - R ch0 hotplug ptm local wscons pci0 pci1 pci2 pci3 uall video0 - R video1 audio0 audio1 audio2 uk0 random lpa0 lpa1 lpa2 lpt0 - R lpt1 lpt2 lkm tty00 tty01 tty02 tty03 crypto pf systrace wd0 - R wd1 wd2 wd3 std st0 st1 fd - ;; - -wd*|sd*|ccd*) + R bthub0 bthub1 bthub2 vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 + R sd4 sd5 sd6 sd7 sd8 sd9 cd0 cd1 rd0 tun0 tun1 tun2 tun3 bpf0 + R bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0 fd1 fd1B + R fd1C fd1D fd1E fd1F fd1G fd1H fd0 fd0B fd0C fd0D fd0E fd0F + R fd0G fd0H diskmap vscsi0 nnpfs0 bio ch0 hotplug ptm local + R wscons pci0 pci1 pci2 pci3 uall video0 video1 audio0 audio1 + R audio2 uk0 random lpa0 lpa1 lpa2 lpt0 lpt1 lpt2 lkm tty00 + R tty01 tty02 tty03 crypto pf systrace wd0 wd1 wd2 wd3 std st0 + R st1 fd + ;; + +wd*|sd*) case $i in wd*) dodisk wd $U 8 39 $U 0;; sd*) dodisk sd $U 4 10 $U 0;; - ccd*) dodisk ccd $U 1 7 $U 0;; esac ;; diff --git a/src/etc/etc.hppa64/MAKEDEV b/src/etc/etc.hppa64/MAKEDEV index 8319ee29..5fcdba49 100644 --- a/src/etc/etc.hppa64/MAKEDEV +++ b/src/etc/etc.hppa64/MAKEDEV @@ -3,8 +3,8 @@ # THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. # generated from: # -# OpenBSD: etc.hppa64/MAKEDEV.md,v 1.22 2010/11/19 20:55:48 miod Exp -# OpenBSD: MAKEDEV.common,v 1.54 2011/04/18 16:52:10 thib Exp +# OpenBSD: etc.hppa64/MAKEDEV.md,v 1.23 2011/10/06 20:49:27 deraadt Exp +# OpenBSD: MAKEDEV.common,v 1.57 2011/10/06 20:49:25 deraadt Exp # OpenBSD: MAKEDEV.mi,v 1.80 2011/04/18 16:52:10 thib Exp # OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp # @@ -30,7 +30,6 @@ # std Standard devices # local Configuration specific devices # Disks: -# ccd* Concatenated disk devices # cd* ATAPI and SCSI CD-ROM drives # fd* Floppy disk drives (3 1/2", 5 1/4") # sd* SCSI disks, including flopticals @@ -494,21 +493,20 @@ local) ;; all) - R ccd0 ccd1 ccd2 ccd3 vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4 - R sd5 sd6 sd7 sd8 sd9 cd0 cd1 rd0 tun0 tun1 tun2 tun3 bio bpf0 - R bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0 fd1 fd1B - R fd1C fd1D fd1E fd1F fd1G fd1H fd0 fd0B fd0C fd0D fd0E fd0F - R fd0G fd0H diskmap vscsi0 nnpfs0 ch0 ptm local wscons pci0 - R pci1 pci2 pci3 uall video0 video1 audio0 audio1 audio2 uk0 - R random lpa0 lpa1 lpa2 lpt0 lpt1 lpt2 lkm tty00 tty01 tty02 - R tty03 crypto pf systrace wd0 wd1 wd2 wd3 std st0 st1 fd + R vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4 sd5 sd6 sd7 sd8 sd9 + R cd0 cd1 rd0 tun0 tun1 tun2 tun3 bio bpf0 bpf1 bpf2 bpf3 bpf4 + R bpf5 bpf6 bpf7 bpf8 bpf9 pty0 fd1 fd1B fd1C fd1D fd1E fd1F + R fd1G fd1H fd0 fd0B fd0C fd0D fd0E fd0F fd0G fd0H diskmap + R vscsi0 nnpfs0 ch0 ptm local wscons pci0 pci1 pci2 pci3 uall + R video0 video1 audio0 audio1 audio2 uk0 random lpa0 lpa1 lpa2 + R lpt0 lpt1 lpt2 lkm tty00 tty01 tty02 tty03 crypto pf + R systrace wd0 wd1 wd2 wd3 std st0 st1 fd ;; -wd*|sd*|ccd*) +wd*|sd*) case $i in wd*) dodisk wd $U 8 39 $U 0;; sd*) dodisk sd $U 4 10 $U 0;; - ccd*) dodisk ccd $U 1 7 $U 0;; esac ;; diff --git a/src/etc/etc.i386/MAKEDEV b/src/etc/etc.i386/MAKEDEV index 666b2714..b86e9839 100644 --- a/src/etc/etc.i386/MAKEDEV +++ b/src/etc/etc.i386/MAKEDEV @@ -3,8 +3,8 @@ # THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. # generated from: # -# OpenBSD: etc.i386/MAKEDEV.md,v 1.59 2011/06/26 23:28:23 tedu Exp -# OpenBSD: MAKEDEV.common,v 1.55 2011/06/26 23:28:23 tedu Exp +# OpenBSD: etc.i386/MAKEDEV.md,v 1.60 2011/10/06 20:49:27 deraadt Exp +# OpenBSD: MAKEDEV.common,v 1.57 2011/10/06 20:49:25 deraadt Exp # OpenBSD: MAKEDEV.mi,v 1.80 2011/04/18 16:52:10 thib Exp # OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp # @@ -30,7 +30,6 @@ # std Standard devices # local Configuration specific devices # Disks: -# ccd* Concatenated disk devices # cd* ATAPI and SCSI CD-ROM drives # fd* Floppy disk drives (3 1/2", 5 1/4") # raid* RAIDframe disk devices @@ -598,26 +597,25 @@ local) all) R amdmsr drm0 agp0 bthub0 bthub1 bthub2 nvram gpio0 gpio1 - R gpio2 bktr0 ccd0 ccd1 ccd2 ccd3 vnd0 vnd1 vnd2 vnd3 sd0 sd1 - R sd2 sd3 sd4 sd5 sd6 sd7 sd8 sd9 cd0 cd1 rd0 tun0 tun1 tun2 - R tun3 bio bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 - R pty0 fd1 fd1B fd1C fd1D fd1E fd1F fd1G fd1H fd0 fd0B fd0C - R fd0D fd0E fd0F fd0G fd0H diskmap vscsi0 nnpfs0 ch0 hotplug - R ptm gpr0 local wscons pci0 pci1 pci2 pci3 iop0 iop1 uall - R rmidi0 rmidi1 rmidi2 rmidi3 rmidi4 rmidi5 rmidi6 rmidi7 - R tuner0 radio0 music0 speaker video0 video1 audio0 audio1 - R audio2 uk0 random joy0 joy1 lpa0 lpa1 lpa2 lpt0 lpt1 lpt2 - R lkm tty00 tty01 tty02 tty03 ttyc0 ttyc1 ttyc2 ttyc3 ttyc4 - R ttyc5 ttyc6 ttyc7 apm crypto pf pctr systrace wd0 wd1 wd2 - R wd3 raid0 raid1 raid2 raid3 std st0 st1 fd - ;; - -wd*|sd*|raid*|ccd*) + R gpio2 bktr0 vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4 sd5 sd6 + R sd7 sd8 sd9 cd0 cd1 rd0 tun0 tun1 tun2 tun3 bio bpf0 bpf1 + R bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0 fd1 fd1B fd1C + R fd1D fd1E fd1F fd1G fd1H fd0 fd0B fd0C fd0D fd0E fd0F fd0G + R fd0H diskmap vscsi0 nnpfs0 ch0 hotplug ptm gpr0 local wscons + R pci0 pci1 pci2 pci3 iop0 iop1 uall rmidi0 rmidi1 rmidi2 + R rmidi3 rmidi4 rmidi5 rmidi6 rmidi7 tuner0 radio0 music0 + R speaker video0 video1 audio0 audio1 audio2 uk0 random joy0 + R joy1 lpa0 lpa1 lpa2 lpt0 lpt1 lpt2 lkm tty00 tty01 tty02 + R tty03 ttyc0 ttyc1 ttyc2 ttyc3 ttyc4 ttyc5 ttyc6 ttyc7 apm + R crypto pf pctr systrace wd0 wd1 wd2 wd3 raid0 raid1 raid2 + R raid3 std st0 st1 fd + ;; + +wd*|sd*|raid*) case $i in wd*) dodisk wd $U 0 3 $U 0;; sd*) dodisk sd $U 4 13 $U 0;; raid*) dodisk raid $U 19 54 $U 0;; - ccd*) dodisk ccd $U 16 18 $U 0;; esac ;; diff --git a/src/etc/etc.landisk/MAKEDEV b/src/etc/etc.landisk/MAKEDEV index 449fb8b2..764732c5 100644 --- a/src/etc/etc.landisk/MAKEDEV +++ b/src/etc/etc.landisk/MAKEDEV @@ -3,8 +3,8 @@ # THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. # generated from: # -# OpenBSD: etc.landisk/MAKEDEV.md,v 1.23 2010/09/30 15:27:54 claudio Exp -# OpenBSD: MAKEDEV.common,v 1.54 2011/04/18 16:52:10 thib Exp +# OpenBSD: etc.landisk/MAKEDEV.md,v 1.24 2011/10/06 20:49:27 deraadt Exp +# OpenBSD: MAKEDEV.common,v 1.57 2011/10/06 20:49:25 deraadt Exp # OpenBSD: MAKEDEV.mi,v 1.80 2011/04/18 16:52:10 thib Exp # OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp # @@ -30,7 +30,6 @@ # std Standard devices # local Configuration specific devices # Disks: -# ccd* Concatenated disk devices # cd* ATAPI and SCSI CD-ROM drives # ch* SCSI media changers # raid* RAIDframe disk devices @@ -477,23 +476,21 @@ local) ;; all) - R bthub0 bthub1 bthub2 ccd0 ccd1 ccd2 ccd3 vnd0 vnd1 vnd2 - R vnd3 sd0 sd1 sd2 sd3 sd4 sd5 sd6 sd7 sd8 sd9 cd0 cd1 rd0 - R tun0 tun1 tun2 tun3 bio bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 - R bpf7 bpf8 bpf9 pty0 diskmap vscsi0 nnpfs0 ch0 ttya hotplug - R ptm local wscons pci0 pci1 pci2 pci3 uall rmidi0 rmidi1 - R rmidi2 rmidi3 rmidi4 rmidi5 rmidi6 rmidi7 radio0 music0 - R video0 video1 audio0 audio1 audio2 uk0 random lkm crypto pf - R systrace wd0 wd1 wd2 wd3 raid0 raid1 raid2 raid3 std st0 st1 - R fd - ;; - -wd*|sd*|raid*|ccd*) + R bthub0 bthub1 bthub2 vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 + R sd4 sd5 sd6 sd7 sd8 sd9 cd0 cd1 rd0 tun0 tun1 tun2 tun3 bio + R bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0 + R diskmap vscsi0 nnpfs0 ch0 ttya hotplug ptm local wscons pci0 + R pci1 pci2 pci3 uall rmidi0 rmidi1 rmidi2 rmidi3 rmidi4 + R rmidi5 rmidi6 rmidi7 radio0 music0 video0 video1 audio0 + R audio1 audio2 uk0 random lkm crypto pf systrace wd0 wd1 wd2 + R wd3 raid0 raid1 raid2 raid3 std st0 st1 fd + ;; + +wd*|sd*|raid*) case $i in wd*) dodisk wd $U 16 16 $U 0;; sd*) dodisk sd $U 24 24 $U 0;; raid*) dodisk raid $U 71 71 $U 0;; - ccd*) dodisk ccd $U 21 21 $U 0;; esac ;; diff --git a/src/etc/etc.loongson/MAKEDEV b/src/etc/etc.loongson/MAKEDEV index e217dceb..e5ac1e66 100644 --- a/src/etc/etc.loongson/MAKEDEV +++ b/src/etc/etc.loongson/MAKEDEV @@ -3,8 +3,8 @@ # THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. # generated from: # -# OpenBSD: etc.loongson/MAKEDEV.md,v 1.10 2010/11/19 20:55:48 miod Exp -# OpenBSD: MAKEDEV.common,v 1.54 2011/04/18 16:52:10 thib Exp +# OpenBSD: etc.loongson/MAKEDEV.md,v 1.11 2011/10/06 20:49:27 deraadt Exp +# OpenBSD: MAKEDEV.common,v 1.57 2011/10/06 20:49:25 deraadt Exp # OpenBSD: MAKEDEV.mi,v 1.80 2011/04/18 16:52:10 thib Exp # OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp # @@ -30,7 +30,6 @@ # std Standard devices # local Configuration specific devices # Disks: -# ccd* Concatenated disk devices # cd* ATAPI and SCSI CD-ROM drives # rd* "rd" pseudo-disks # sd* SCSI disks, including flopticals @@ -462,20 +461,19 @@ ramdisk) ;; all) - R bthub0 bthub1 bthub2 ccd0 ccd1 ccd2 ccd3 vnd0 vnd1 vnd2 - R vnd3 sd0 sd1 sd2 sd3 sd4 sd5 sd6 sd7 sd8 sd9 cd0 cd1 rd0 - R tun0 tun1 tun2 tun3 bio bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 - R bpf7 bpf8 bpf9 pty0 pty1 pty2 diskmap vscsi0 nnpfs0 hotplug - R ptm local wscons pci0 pci1 pci2 pci3 uall video0 video1 - R audio0 audio1 audio2 uk0 random tty00 tty01 tty02 tty03 apm - R crypto pf systrace wd0 wd1 wd2 wd3 std st0 st1 fd + R bthub0 bthub1 bthub2 vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 + R sd4 sd5 sd6 sd7 sd8 sd9 cd0 cd1 rd0 tun0 tun1 tun2 tun3 bio + R bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0 pty1 + R pty2 diskmap vscsi0 nnpfs0 hotplug ptm local wscons pci0 + R pci1 pci2 pci3 uall video0 video1 audio0 audio1 audio2 uk0 + R random tty00 tty01 tty02 tty03 apm crypto pf systrace wd0 + R wd1 wd2 wd3 std st0 st1 fd ;; -wd*|sd*|ccd*) +wd*|sd*) case $i in wd*) dodisk wd $U 4 18 $U 0;; sd*) dodisk sd $U 0 9 $U 0;; - ccd*) dodisk ccd $U 6 23 $U 0;; esac ;; diff --git a/src/etc/etc.luna88k/MAKEDEV b/src/etc/etc.luna88k/MAKEDEV index e5156d52..89d43600 100644 --- a/src/etc/etc.luna88k/MAKEDEV +++ b/src/etc/etc.luna88k/MAKEDEV @@ -3,8 +3,8 @@ # THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. # generated from: # -# OpenBSD: etc.luna88k/MAKEDEV.md,v 1.17 2010/09/30 15:27:54 claudio Exp -# OpenBSD: MAKEDEV.common,v 1.54 2011/04/18 16:52:10 thib Exp +# OpenBSD: etc.luna88k/MAKEDEV.md,v 1.18 2011/10/06 20:49:27 deraadt Exp +# OpenBSD: MAKEDEV.common,v 1.57 2011/10/06 20:49:25 deraadt Exp # OpenBSD: MAKEDEV.mi,v 1.80 2011/04/18 16:52:10 thib Exp # OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp # @@ -30,7 +30,6 @@ # std Standard devices # local Configuration specific devices # Disks: -# ccd* Concatenated disk devices # cd* ATAPI and SCSI CD-ROM drives # rd* "rd" pseudo-disks # sd* SCSI disks, including flopticals @@ -374,17 +373,15 @@ ramdisk) ;; all) - R lcd ttya ccd0 ccd1 ccd2 ccd3 vnd0 vnd1 vnd2 vnd3 sd0 sd1 - R sd2 sd3 sd4 cd0 cd1 rd0 tun0 tun1 tun2 tun3 bio bpf0 bpf1 - R bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0 diskmap vscsi0 - R nnpfs0 ch0 ptm local wscons uk0 random lkm pf systrace std - R st0 st1 fd + R lcd ttya vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4 cd0 cd1 + R rd0 tun0 tun1 tun2 tun3 bio bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 + R bpf6 bpf7 bpf8 bpf9 pty0 diskmap vscsi0 nnpfs0 ch0 ptm local + R wscons uk0 random lkm pf systrace std st0 st1 fd ;; -sd*|ccd*) +sd*) case $i in sd*) dodisk sd $U 4 8 $U 0;; - ccd*) dodisk ccd $U 9 17 $U 0;; esac ;; diff --git a/src/etc/etc.mac68k/MAKEDEV b/src/etc/etc.mac68k/MAKEDEV index 3f18c096..05864642 100644 --- a/src/etc/etc.mac68k/MAKEDEV +++ b/src/etc/etc.mac68k/MAKEDEV @@ -3,8 +3,8 @@ # THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. # generated from: # -# OpenBSD: etc.mac68k/MAKEDEV.md,v 1.35 2010/09/30 15:27:54 claudio Exp -# OpenBSD: MAKEDEV.common,v 1.54 2011/04/18 16:52:10 thib Exp +# OpenBSD: etc.mac68k/MAKEDEV.md,v 1.36 2011/10/06 20:49:27 deraadt Exp +# OpenBSD: MAKEDEV.common,v 1.57 2011/10/06 20:49:25 deraadt Exp # OpenBSD: MAKEDEV.mi,v 1.80 2011/04/18 16:52:10 thib Exp # OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp # @@ -30,7 +30,6 @@ # std Standard devices # local Configuration specific devices # Disks: -# ccd* Concatenated disk devices # cd* ATAPI and SCSI CD-ROM drives # rd* "rd" pseudo-disks # sd* SCSI disks, including flopticals @@ -394,17 +393,15 @@ ramdisk) ;; all) - R ccd0 ccd1 ccd2 ccd3 cd0 cd1 rd0 tun0 tun1 tun2 tun3 bpf0 - R bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0 diskmap - R vscsi0 nnpfs0 ch0 vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4 - R bio ptm local wscons asc0 uk0 random lkm tty00 tty01 pf - R systrace std st0 st1 fd + R cd0 cd1 rd0 tun0 tun1 tun2 tun3 bpf0 bpf1 bpf2 bpf3 bpf4 + R bpf5 bpf6 bpf7 bpf8 bpf9 pty0 diskmap vscsi0 nnpfs0 ch0 vnd0 + R vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4 bio ptm local wscons asc0 + R uk0 random lkm tty00 tty01 pf systrace std st0 st1 fd ;; -sd*|ccd*) +sd*) case $i in sd*) dodisk sd $U 4 13 $U 0;; - ccd*) dodisk ccd $U 9 20 $U 0;; esac ;; diff --git a/src/etc/etc.macppc/MAKEDEV b/src/etc/etc.macppc/MAKEDEV index 19906e20..48d06542 100644 --- a/src/etc/etc.macppc/MAKEDEV +++ b/src/etc/etc.macppc/MAKEDEV @@ -3,8 +3,8 @@ # THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. # generated from: # -# OpenBSD: etc.macppc/MAKEDEV.md,v 1.46 2011/04/19 23:07:55 todd Exp -# OpenBSD: MAKEDEV.common,v 1.55 2011/06/26 23:28:23 tedu Exp +# OpenBSD: etc.macppc/MAKEDEV.md,v 1.47 2011/10/06 20:49:27 deraadt Exp +# OpenBSD: MAKEDEV.common,v 1.57 2011/10/06 20:49:25 deraadt Exp # OpenBSD: MAKEDEV.mi,v 1.80 2011/04/18 16:52:10 thib Exp # OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp # @@ -30,7 +30,6 @@ # std Standard devices # local Configuration specific devices # Disks: -# ccd* Concatenated disk devices # cd* ATAPI and SCSI CD-ROM drives # raid* RAIDframe disk devices # rd* "rd" pseudo-disks @@ -532,24 +531,22 @@ ramdisk) ;; all) - R bthub0 bthub1 bthub2 bio gpio0 gpio1 gpio2 ccd0 ccd1 ccd2 - R ccd3 vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4 sd5 sd6 sd7 sd8 - R sd9 cd0 cd1 rd0 tun0 tun1 tun2 tun3 bpf0 bpf1 bpf2 bpf3 bpf4 - R bpf5 bpf6 bpf7 bpf8 bpf9 pty0 diskmap vscsi0 nnpfs0 ch0 cuaa - R cuab ttya ttyb hotplug ptm local wscons pci0 pci1 pci2 pci3 - R iop0 iop1 uall rmidi0 rmidi1 rmidi2 rmidi3 rmidi4 rmidi5 - R rmidi6 rmidi7 tuner0 radio0 music0 video0 video1 audio0 - R audio1 audio2 uk0 random lkm tty00 tty01 tty02 tty03 apm - R crypto pf systrace wd0 wd1 wd2 wd3 raid0 raid1 raid2 raid3 - R std st0 st1 fd - ;; - -wd*|sd*|raid*|ccd*) + R bthub0 bthub1 bthub2 bio gpio0 gpio1 gpio2 vnd0 vnd1 vnd2 + R vnd3 sd0 sd1 sd2 sd3 sd4 sd5 sd6 sd7 sd8 sd9 cd0 cd1 rd0 + R tun0 tun1 tun2 tun3 bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 + R bpf8 bpf9 pty0 diskmap vscsi0 nnpfs0 ch0 cuaa cuab ttya ttyb + R hotplug ptm local wscons pci0 pci1 pci2 pci3 iop0 iop1 uall + R rmidi0 rmidi1 rmidi2 rmidi3 rmidi4 rmidi5 rmidi6 rmidi7 + R tuner0 radio0 music0 video0 video1 audio0 audio1 audio2 uk0 + R random lkm tty00 tty01 tty02 tty03 apm crypto pf systrace + R wd0 wd1 wd2 wd3 raid0 raid1 raid2 raid3 std st0 st1 fd + ;; + +wd*|sd*|raid*) case $i in wd*) dodisk wd $U 0 11 $U 0;; sd*) dodisk sd $U 2 8 $U 0;; raid*) dodisk raid $U 19 54 $U 0;; - ccd*) dodisk ccd $U 16 18 $U 0;; esac ;; diff --git a/src/etc/etc.mvme68k/MAKEDEV b/src/etc/etc.mvme68k/MAKEDEV index 0987e6ab..275b10c1 100644 --- a/src/etc/etc.mvme68k/MAKEDEV +++ b/src/etc/etc.mvme68k/MAKEDEV @@ -3,8 +3,8 @@ # THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. # generated from: # -# OpenBSD: etc.mvme68k/MAKEDEV.md,v 1.30 2010/09/30 15:27:54 claudio Exp -# OpenBSD: MAKEDEV.common,v 1.54 2011/04/18 16:52:10 thib Exp +# OpenBSD: etc.mvme68k/MAKEDEV.md,v 1.31 2011/10/06 20:49:27 deraadt Exp +# OpenBSD: MAKEDEV.common,v 1.57 2011/10/06 20:49:25 deraadt Exp # OpenBSD: MAKEDEV.mi,v 1.80 2011/04/18 16:52:10 thib Exp # OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp # @@ -30,7 +30,6 @@ # std Standard devices # local Configuration specific devices # Disks: -# ccd* Concatenated disk devices # cd* ATAPI and SCSI CD-ROM drives # rd* "rd" pseudo-disks # sd* SCSI disks, including flopticals @@ -424,18 +423,16 @@ ramdisk) all) R ttyw0 ttyw1 ttyw2 ttyw3 ttyd0 ttyd1 tty00 tty01 tty02 tty03 - R cuaa cuab cuac cuad ttya ttyb ttyc ttyd ccd0 ccd1 ccd2 ccd3 - R vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4 cd0 cd1 rd0 tun0 - R tun1 tun2 tun3 bio bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 - R bpf8 bpf9 pty0 diskmap vscsi0 nnpfs0 ch0 vmel0 vmes0 flash0 - R nvram0 sram0 ptm local uk0 random lkm pf systrace std st0 - R st1 fd + R cuaa cuab cuac cuad ttya ttyb ttyc ttyd vnd0 vnd1 vnd2 vnd3 + R sd0 sd1 sd2 sd3 sd4 cd0 cd1 rd0 tun0 tun1 tun2 tun3 bio bpf0 + R bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0 diskmap + R vscsi0 nnpfs0 ch0 vmel0 vmes0 flash0 nvram0 sram0 ptm local + R uk0 random lkm pf systrace std st0 st1 fd ;; -sd*|ccd*) +sd*) case $i in sd*) dodisk sd $U 4 8 $U 0;; - ccd*) dodisk ccd $U 5 17 $U 0;; esac ;; diff --git a/src/etc/etc.mvme88k/MAKEDEV b/src/etc/etc.mvme88k/MAKEDEV index e11879c0..3b6bfca9 100644 --- a/src/etc/etc.mvme88k/MAKEDEV +++ b/src/etc/etc.mvme88k/MAKEDEV @@ -3,8 +3,8 @@ # THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. # generated from: # -# OpenBSD: etc.mvme88k/MAKEDEV.md,v 1.29 2010/09/30 15:27:54 claudio Exp -# OpenBSD: MAKEDEV.common,v 1.54 2011/04/18 16:52:10 thib Exp +# OpenBSD: etc.mvme88k/MAKEDEV.md,v 1.30 2011/10/06 20:49:27 deraadt Exp +# OpenBSD: MAKEDEV.common,v 1.57 2011/10/06 20:49:25 deraadt Exp # OpenBSD: MAKEDEV.mi,v 1.80 2011/04/18 16:52:10 thib Exp # OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp # @@ -30,7 +30,6 @@ # std Standard devices # local Configuration specific devices # Disks: -# ccd* Concatenated disk devices # cd* ATAPI and SCSI CD-ROM drives # rd* "rd" pseudo-disks # sd* SCSI disks, including flopticals @@ -379,18 +378,16 @@ ramdisk) all) R ttyv0 ttyv1 ttyv2 ttyv3 ttyv4 ttyv5 ttyv6 ttyv7 tty00 tty01 - R tty02 tty03 tty04 tty05 tty06 tty07 ttya ttyb ccd0 ccd1 ccd2 - R ccd3 vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4 cd0 cd1 rd0 - R tun0 tun1 tun2 tun3 bio bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 - R bpf7 bpf8 bpf9 pty0 diskmap vscsi0 nnpfs0 ch0 vmel0 vmes0 - R nvram0 sram0 ptm local uk0 random lkm pf systrace std st0 - R st1 fd + R tty02 tty03 tty04 tty05 tty06 tty07 ttya ttyb vnd0 vnd1 vnd2 + R vnd3 sd0 sd1 sd2 sd3 sd4 cd0 cd1 rd0 tun0 tun1 tun2 tun3 bio + R bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0 + R diskmap vscsi0 nnpfs0 ch0 vmel0 vmes0 nvram0 sram0 ptm local + R uk0 random lkm pf systrace std st0 st1 fd ;; -sd*|ccd*) +sd*) case $i in sd*) dodisk sd $U 4 8 $U 0;; - ccd*) dodisk ccd $U 9 17 $U 0;; esac ;; diff --git a/src/etc/etc.palm/MAKEDEV b/src/etc/etc.palm/MAKEDEV index 179d72f0..3a62c94a 100644 --- a/src/etc/etc.palm/MAKEDEV +++ b/src/etc/etc.palm/MAKEDEV @@ -3,8 +3,8 @@ # THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. # generated from: # -# OpenBSD: etc.palm/MAKEDEV.md,v 1.8 2010/09/30 15:27:54 claudio Exp -# OpenBSD: MAKEDEV.common,v 1.54 2011/04/18 16:52:10 thib Exp +# OpenBSD: etc.palm/MAKEDEV.md,v 1.9 2011/10/06 20:49:27 deraadt Exp +# OpenBSD: MAKEDEV.common,v 1.57 2011/10/06 20:49:25 deraadt Exp # OpenBSD: MAKEDEV.mi,v 1.80 2011/04/18 16:52:10 thib Exp # OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp # @@ -30,7 +30,6 @@ # std Standard devices # local Configuration specific devices # Disks: -# ccd* Concatenated disk devices # cd* ATAPI and SCSI CD-ROM drives # ch* SCSI media changers # raid* RAIDframe disk devices @@ -490,23 +489,21 @@ local) ;; all) - R bthub0 bthub1 bthub2 ccd0 ccd1 ccd2 ccd3 vnd0 vnd1 vnd2 - R vnd3 sd0 sd1 sd2 sd3 sd4 sd5 sd6 sd7 sd8 sd9 cd0 cd1 rd0 - R tun0 tun1 tun2 tun3 bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 - R bpf8 bpf9 pty0 bio vscsi0 nnpfs0 ch0 hotplug ptm local - R wscons uall rmidi0 rmidi1 rmidi2 rmidi3 rmidi4 rmidi5 rmidi6 - R rmidi7 tuner0 radio0 music0 video0 video1 audio0 audio1 - R audio2 uk0 random lkm tty00 tty01 tty02 tty03 apm crypto pf - R systrace wd0 wd1 wd2 wd3 raid0 raid1 raid2 raid3 std st0 st1 - R fd - ;; - -wd*|sd*|raid*|ccd*) + R bthub0 bthub1 bthub2 vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 + R sd4 sd5 sd6 sd7 sd8 sd9 cd0 cd1 rd0 tun0 tun1 tun2 tun3 bpf0 + R bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0 bio vscsi0 + R nnpfs0 ch0 hotplug ptm local wscons uall rmidi0 rmidi1 + R rmidi2 rmidi3 rmidi4 rmidi5 rmidi6 rmidi7 tuner0 radio0 + R music0 video0 video1 audio0 audio1 audio2 uk0 random lkm + R tty00 tty01 tty02 tty03 apm crypto pf systrace wd0 wd1 wd2 + R wd3 raid0 raid1 raid2 raid3 std st0 st1 fd + ;; + +wd*|sd*|raid*) case $i in wd*) dodisk wd $U 16 16 $U 0;; sd*) dodisk sd $U 24 24 $U 0;; raid*) dodisk raid $U 71 71 $U 0;; - ccd*) dodisk ccd $U 21 21 $U 0;; esac ;; diff --git a/src/etc/etc.sgi/MAKEDEV b/src/etc/etc.sgi/MAKEDEV index e16e70ba..b9271456 100644 --- a/src/etc/etc.sgi/MAKEDEV +++ b/src/etc/etc.sgi/MAKEDEV @@ -3,8 +3,8 @@ # THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. # generated from: # -# OpenBSD: etc.sgi/MAKEDEV.md,v 1.33 2010/11/19 20:55:48 miod Exp -# OpenBSD: MAKEDEV.common,v 1.54 2011/04/18 16:52:10 thib Exp +# OpenBSD: etc.sgi/MAKEDEV.md,v 1.34 2011/10/06 20:49:27 deraadt Exp +# OpenBSD: MAKEDEV.common,v 1.57 2011/10/06 20:49:25 deraadt Exp # OpenBSD: MAKEDEV.mi,v 1.80 2011/04/18 16:52:10 thib Exp # OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp # @@ -30,7 +30,6 @@ # std Standard devices # local Configuration specific devices # Disks: -# ccd* Concatenated disk devices # cd* ATAPI and SCSI CD-ROM drives # rd* "rd" pseudo-disks # sd* SCSI disks, including flopticals @@ -455,20 +454,19 @@ ramdisk) ;; all) - R ccd0 ccd1 ccd2 ccd3 vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4 - R sd5 sd6 sd7 sd8 sd9 cd0 cd1 rd0 tun0 tun1 tun2 tun3 bio bpf0 - R bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0 pty1 pty2 - R diskmap vscsi0 nnpfs0 ch0 hotplug ptm local wscons pci0 pci1 - R pci2 pci3 uall video0 video1 audio0 audio1 audio2 uk0 random - R tty00 tty01 tty02 tty03 crypto pf systrace wd0 wd1 wd2 wd3 - R std st0 st1 fd + R vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4 sd5 sd6 sd7 sd8 sd9 + R cd0 cd1 rd0 tun0 tun1 tun2 tun3 bio bpf0 bpf1 bpf2 bpf3 bpf4 + R bpf5 bpf6 bpf7 bpf8 bpf9 pty0 pty1 pty2 diskmap vscsi0 + R nnpfs0 ch0 hotplug ptm local wscons pci0 pci1 pci2 pci3 uall + R video0 video1 audio0 audio1 audio2 uk0 random tty00 tty01 + R tty02 tty03 crypto pf systrace wd0 wd1 wd2 wd3 std st0 st1 + R fd ;; -wd*|sd*|ccd*) +wd*|sd*) case $i in wd*) dodisk wd $U 4 18 $U 0;; sd*) dodisk sd $U 0 9 $U 0;; - ccd*) dodisk ccd $U 6 23 $U 0;; esac ;; diff --git a/src/etc/etc.socppc/MAKEDEV b/src/etc/etc.socppc/MAKEDEV index f69e2135..eb4b0879 100644 --- a/src/etc/etc.socppc/MAKEDEV +++ b/src/etc/etc.socppc/MAKEDEV @@ -3,8 +3,8 @@ # THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. # generated from: # -# OpenBSD: etc.socppc/MAKEDEV.md,v 1.14 2011/07/29 17:54:09 kettenis Exp -# OpenBSD: MAKEDEV.common,v 1.56 2011/07/06 18:34:20 miod Exp +# OpenBSD: etc.socppc/MAKEDEV.md,v 1.15 2011/10/06 20:49:27 deraadt Exp +# OpenBSD: MAKEDEV.common,v 1.57 2011/10/06 20:49:25 deraadt Exp # OpenBSD: MAKEDEV.mi,v 1.80 2011/04/18 16:52:10 thib Exp # OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp # @@ -30,7 +30,6 @@ # std Standard devices # local Configuration specific devices # Disks: -# ccd* Concatenated disk devices # cd* ATAPI and SCSI CD-ROM drives # raid* RAIDframe disk devices # rd* "rd" pseudo-disks @@ -431,21 +430,19 @@ ramdisk) ;; all) - R bthub0 bthub1 bthub2 ccd0 ccd1 ccd2 ccd3 vnd0 vnd1 vnd2 - R vnd3 sd0 sd1 sd2 sd3 sd4 sd5 sd6 sd7 sd8 sd9 cd0 cd1 rd0 - R tun0 tun1 tun2 tun3 bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 - R bpf8 bpf9 pty0 diskmap vscsi0 ch0 hotplug ptm local wscons - R pci0 pci1 pci2 pci3 uall video0 video1 random lkm tty00 - R tty01 tty02 tty03 pf systrace wd0 wd1 wd2 wd3 raid0 raid1 - R raid2 raid3 std st0 st1 fd + R bthub0 bthub1 bthub2 vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 + R sd4 sd5 sd6 sd7 sd8 sd9 cd0 cd1 rd0 tun0 tun1 tun2 tun3 bpf0 + R bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0 diskmap + R vscsi0 ch0 hotplug ptm local wscons pci0 pci1 pci2 pci3 uall + R video0 video1 random lkm tty00 tty01 tty02 tty03 pf systrace + R wd0 wd1 wd2 wd3 raid0 raid1 raid2 raid3 std st0 st1 fd ;; -wd*|sd*|raid*|ccd*) +wd*|sd*|raid*) case $i in wd*) dodisk wd $U 0 11 $U 0;; sd*) dodisk sd $U 2 8 $U 0;; raid*) dodisk raid $U 19 54 $U 0;; - ccd*) dodisk ccd $U 16 18 $U 0;; esac ;; diff --git a/src/etc/etc.sparc/MAKEDEV b/src/etc/etc.sparc/MAKEDEV index 83ad5560..3dd770c5 100644 --- a/src/etc/etc.sparc/MAKEDEV +++ b/src/etc/etc.sparc/MAKEDEV @@ -3,8 +3,8 @@ # THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. # generated from: # -# OpenBSD: etc.sparc/MAKEDEV.md,v 1.46 2010/11/19 20:55:48 miod Exp -# OpenBSD: MAKEDEV.common,v 1.54 2011/04/18 16:52:10 thib Exp +# OpenBSD: etc.sparc/MAKEDEV.md,v 1.47 2011/10/06 20:49:27 deraadt Exp +# OpenBSD: MAKEDEV.common,v 1.57 2011/10/06 20:49:25 deraadt Exp # OpenBSD: MAKEDEV.mi,v 1.80 2011/04/18 16:52:10 thib Exp # OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp # @@ -30,7 +30,6 @@ # std Standard devices # local Configuration specific devices # Disks: -# ccd* Concatenated disk devices # cd* ATAPI and SCSI CD-ROM drives # fd* Floppy disk drives (3 1/2", 5 1/4") # presto* Prestoserve NVRAM memory @@ -520,25 +519,23 @@ local) ;; all) - R presto0 bpp0 ccd0 ccd1 ccd2 ccd3 vnd0 vnd1 vnd2 vnd3 sd0 - R sd1 sd2 sd3 sd4 cd0 cd1 rd0 xy0 xy1 xy2 xy3 tun0 tun1 tun2 - R tun3 bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0 - R fd1 fd1B fd1C fd1D fd1E fd1F fd1G fd1H fd0 fd0B fd0C fd0D - R fd0E fd0F fd0G fd0H diskmap vscsi0 nnpfs0 ch0 bio cuaa cuab - R cuac cuad ttya ttyb ttyc ttyd hotplug ptm local wscons - R audio0 audio1 audio2 uk0 random lkm tty00 tty01 tty02 tty03 - R apm pf systrace xd0 xd1 xd2 xd3 raid0 raid1 raid2 raid3 std - R st0 st1 fd - ;; - -presto*|xd*|xy*|sd*|raid*|ccd*) + R presto0 bpp0 vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4 cd0 + R cd1 rd0 xy0 xy1 xy2 xy3 tun0 tun1 tun2 tun3 bpf0 bpf1 bpf2 + R bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0 fd1 fd1B fd1C fd1D + R fd1E fd1F fd1G fd1H fd0 fd0B fd0C fd0D fd0E fd0F fd0G fd0H + R diskmap vscsi0 nnpfs0 ch0 bio cuaa cuab cuac cuad ttya ttyb + R ttyc ttyd hotplug ptm local wscons audio0 audio1 audio2 uk0 + R random lkm tty00 tty01 tty02 tty03 apm pf systrace xd0 xd1 + R xd2 xd3 raid0 raid1 raid2 raid3 std st0 st1 fd + ;; + +presto*|xd*|xy*|sd*|raid*) case $i in presto*) dodisk presto $U 26 25 $U 0;; xd*) dodisk xd $U 10 42 $U 0;; xy*) dodisk xy $U 3 9 $U 0;; sd*) dodisk sd $U 7 17 $U 0;; raid*) dodisk raid $U 25 123 $U 0;; - ccd*) dodisk ccd $U 9 23 $U 0;; esac ;; diff --git a/src/etc/etc.sparc64/MAKEDEV b/src/etc/etc.sparc64/MAKEDEV index 8cfc265f..3c922f8d 100644 --- a/src/etc/etc.sparc64/MAKEDEV +++ b/src/etc/etc.sparc64/MAKEDEV @@ -3,8 +3,8 @@ # THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. # generated from: # -# OpenBSD: etc.sparc64/MAKEDEV.md,v 1.62 2010/10/08 18:21:34 ratchov Exp -# OpenBSD: MAKEDEV.common,v 1.54 2011/04/18 16:52:10 thib Exp +# OpenBSD: etc.sparc64/MAKEDEV.md,v 1.63 2011/10/06 20:49:27 deraadt Exp +# OpenBSD: MAKEDEV.common,v 1.57 2011/10/06 20:49:25 deraadt Exp # OpenBSD: MAKEDEV.mi,v 1.80 2011/04/18 16:52:10 thib Exp # OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp # @@ -30,7 +30,6 @@ # std Standard devices # local Configuration specific devices # Disks: -# ccd* Concatenated disk devices # cd* ATAPI and SCSI CD-ROM drives # fd* Floppy disk drives (3 1/2", 5 1/4") # raid* RAIDframe disk devices @@ -621,21 +620,20 @@ all) R sd2 sd3 sd4 sd5 sd6 sd7 sd8 sd9 cd0 cd1 rd0 tun0 tun1 tun2 R tun3 bio bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 R pty0 fd1 fd1B fd1C fd1D fd1E fd1F fd1G fd1H fd0 fd0B fd0C - R fd0D fd0E fd0F fd0G fd0H diskmap vscsi0 nnpfs0 ch0 ccd0 ccd1 - R ccd2 ccd3 hotplug ptm local wscons pci0 pci1 pci2 pci3 uall - R rmidi0 rmidi1 rmidi2 rmidi3 rmidi4 rmidi5 rmidi6 rmidi7 - R video0 video1 audio0 audio1 audio2 uk0 random lpa0 lpa1 lpa2 - R lpt0 lpt1 lpt2 lkm tty00 tty01 tty02 tty03 ttyh0 ttyh1 - R crypto pf systrace wd0 wd1 wd2 wd3 raid0 raid1 raid2 raid3 - R std st0 st1 fd + R fd0D fd0E fd0F fd0G fd0H diskmap vscsi0 nnpfs0 ch0 hotplug + R ptm local wscons pci0 pci1 pci2 pci3 uall rmidi0 rmidi1 + R rmidi2 rmidi3 rmidi4 rmidi5 rmidi6 rmidi7 video0 video1 + R audio0 audio1 audio2 uk0 random lpa0 lpa1 lpa2 lpt0 lpt1 + R lpt2 lkm tty00 tty01 tty02 tty03 ttyh0 ttyh1 crypto pf + R systrace wd0 wd1 wd2 wd3 raid0 raid1 raid2 raid3 std st0 st1 + R fd ;; -wd*|sd*|raid*|ccd*) +wd*|sd*|raid*) case $i in wd*) dodisk wd $U 12 26 $U 0;; sd*) dodisk sd $U 7 17 $U 0;; raid*) dodisk raid $U 25 121 $U 0;; - ccd*) dodisk ccd $U 9 23 $U 0;; esac ;; diff --git a/src/etc/etc.vax/MAKEDEV b/src/etc/etc.vax/MAKEDEV index 990e4fd7..218f8ce7 100644 --- a/src/etc/etc.vax/MAKEDEV +++ b/src/etc/etc.vax/MAKEDEV @@ -3,8 +3,8 @@ # THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. # generated from: # -# OpenBSD: etc.vax/MAKEDEV.md,v 1.45 2011/09/03 20:45:17 miod Exp -# OpenBSD: MAKEDEV.common,v 1.56 2011/07/06 18:34:20 miod Exp +# OpenBSD: etc.vax/MAKEDEV.md,v 1.46 2011/10/06 20:49:27 deraadt Exp +# OpenBSD: MAKEDEV.common,v 1.57 2011/10/06 20:49:25 deraadt Exp # OpenBSD: MAKEDEV.mi,v 1.80 2011/04/18 16:52:10 thib Exp # OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp # @@ -30,7 +30,6 @@ # std Standard devices # local Configuration specific devices # Disks: -# ccd* Concatenated disk devices # cd* ATAPI and SCSI CD-ROM drives # hd* HDC9224 disks # ra* MSCP disks @@ -472,21 +471,20 @@ local) ;; all) - R qsc0 dl0 dz0 dhu0 mt0 mt1 hd0 hd1 hd2 ccd0 vnd0 sd0 sd1 sd2 - R sd3 cd0 tun0 tun1 bio bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 - R bpf7 pty0 diskmap vscsi0 nnpfs0 ch0 ptm local wscons audio0 + R qsc0 dl0 dz0 dhu0 mt0 mt1 hd0 hd1 hd2 vnd0 sd0 sd1 sd2 sd3 + R cd0 tun0 tun1 bio bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 + R pty0 diskmap vscsi0 nnpfs0 ch0 ptm local wscons audio0 R audio1 audio2 uk0 random lkm pf systrace rx0 rx1 ra0 ra1 ra2 R ra3 raid0 raid1 raid2 raid3 std st0 st1 fd ;; -sd*|rx*|raid*|ra*|hd*|ccd*) +sd*|rx*|raid*|ra*|hd*) case $i in sd*) dodisk sd $U 20 59 $U 0;; rx*) dodisk rx $U 12 30 $U 0;; raid*) dodisk raid $U 25 73 $U 0;; ra*) dodisk ra $U 9 9 $U 0;; hd*) dodisk hd $U 19 58 $U 0;; - ccd*) dodisk ccd $U 17 54 $U 0;; esac ;; diff --git a/src/etc/etc.zaurus/MAKEDEV b/src/etc/etc.zaurus/MAKEDEV index e835320c..788a3f68 100644 --- a/src/etc/etc.zaurus/MAKEDEV +++ b/src/etc/etc.zaurus/MAKEDEV @@ -3,8 +3,8 @@ # THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. # generated from: # -# OpenBSD: etc.zaurus/MAKEDEV.md,v 1.28 2010/09/30 15:27:54 claudio Exp -# OpenBSD: MAKEDEV.common,v 1.54 2011/04/18 16:52:10 thib Exp +# OpenBSD: etc.zaurus/MAKEDEV.md,v 1.29 2011/10/06 20:49:27 deraadt Exp +# OpenBSD: MAKEDEV.common,v 1.57 2011/10/06 20:49:25 deraadt Exp # OpenBSD: MAKEDEV.mi,v 1.80 2011/04/18 16:52:10 thib Exp # OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp # @@ -30,7 +30,6 @@ # std Standard devices # local Configuration specific devices # Disks: -# ccd* Concatenated disk devices # cd* ATAPI and SCSI CD-ROM drives # ch* SCSI media changers # raid* RAIDframe disk devices @@ -490,23 +489,21 @@ local) ;; all) - R bthub0 bthub1 bthub2 ccd0 ccd1 ccd2 ccd3 vnd0 vnd1 vnd2 - R vnd3 sd0 sd1 sd2 sd3 sd4 sd5 sd6 sd7 sd8 sd9 cd0 cd1 rd0 - R tun0 tun1 tun2 tun3 bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 - R bpf8 bpf9 pty0 bio diskmap vscsi0 nnpfs0 ch0 hotplug ptm - R local wscons uall rmidi0 rmidi1 rmidi2 rmidi3 rmidi4 rmidi5 - R rmidi6 rmidi7 tuner0 radio0 music0 video0 video1 audio0 - R audio1 audio2 uk0 random lkm tty00 tty01 tty02 tty03 apm - R crypto pf systrace wd0 wd1 wd2 wd3 raid0 raid1 raid2 raid3 - R std st0 st1 fd - ;; - -wd*|sd*|raid*|ccd*) + R bthub0 bthub1 bthub2 vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 + R sd4 sd5 sd6 sd7 sd8 sd9 cd0 cd1 rd0 tun0 tun1 tun2 tun3 bpf0 + R bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0 bio + R diskmap vscsi0 nnpfs0 ch0 hotplug ptm local wscons uall + R rmidi0 rmidi1 rmidi2 rmidi3 rmidi4 rmidi5 rmidi6 rmidi7 + R tuner0 radio0 music0 video0 video1 audio0 audio1 audio2 uk0 + R random lkm tty00 tty01 tty02 tty03 apm crypto pf systrace + R wd0 wd1 wd2 wd3 raid0 raid1 raid2 raid3 std st0 st1 fd + ;; + +wd*|sd*|raid*) case $i in wd*) dodisk wd $U 16 16 $U 0;; sd*) dodisk sd $U 24 24 $U 0;; raid*) dodisk raid $U 71 71 $U 0;; - ccd*) dodisk ccd $U 21 21 $U 0;; esac ;;