diff --git a/src/etc/etc.alpha/MAKEDEV b/src/etc/etc.alpha/MAKEDEV index a60dc9bd..3ac4b2e8 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.53 2011/10/22 19:31:23 miod Exp -# OpenBSD: MAKEDEV.common,v 1.58 2011/10/22 19:31:20 miod Exp +# OpenBSD: etc.alpha/MAKEDEV.md,v 1.54 2012/04/06 15:18:41 jsing Exp +# OpenBSD: MAKEDEV.common,v 1.59 2012/04/06 15:18:41 jsing 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 # @@ -32,7 +32,6 @@ # Disks: # cd* ATAPI and SCSI CD-ROM drives # fd* Floppy disk drives (3 1/2", 5 1/4") -# raid* RAIDframe disk devices # rd* "rd" pseudo-disks # sd* SCSI disks, including flopticals # vnd* "file" pseudo-disk devices @@ -565,15 +564,14 @@ all) R tuner0 radio0 music0 speaker video0 video1 uk0 random lpa0 R lpa1 lpa2 lpt0 lpt1 lpt2 lkm tty00 tty01 tty02 tty03 ttyc0 R ttyc1 ttyc2 ttyc3 ttyc4 ttyc5 ttyc6 ttyc7 ttyB0 ttyB1 ttyB2 - R ttyB3 ttyB4 ttyB5 crypto pf systrace wd0 wd1 wd2 wd3 raid0 - R raid1 raid2 raid3 std st0 st1 fd + R ttyB3 ttyB4 ttyB5 crypto pf systrace wd0 wd1 wd2 wd3 std st0 + R st1 fd ;; -wd*|sd*|raid*) +wd*|sd*) 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;; esac ;; diff --git a/src/etc/etc.amd64/MAKEDEV b/src/etc/etc.amd64/MAKEDEV index f7e80561..28f200de 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.46 2011/10/22 19:31:23 miod Exp -# OpenBSD: MAKEDEV.common,v 1.58 2011/10/22 19:31:20 miod Exp +# OpenBSD: etc.amd64/MAKEDEV.md,v 1.47 2012/04/06 15:18:41 jsing Exp +# OpenBSD: MAKEDEV.common,v 1.59 2012/04/06 15:18:41 jsing 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 # @@ -32,7 +32,6 @@ # Disks: # cd* ATAPI and SCSI CD-ROM drives # fd* Floppy disk drives (3 1/2", 5 1/4") -# raid* RAIDframe disk devices # rd* "rd" pseudo-disks # sd* SCSI disks, including flopticals # vnd* "file" pseudo-disk devices @@ -597,15 +596,13 @@ all) R radio0 music0 speaker video0 video1 uk0 random lpa0 lpa1 R lpa2 lpt0 lpt1 lpt2 lkm tty00 tty01 tty02 tty03 ttyc0 ttyc1 R ttyc2 ttyc3 ttyc4 ttyc5 ttyc6 ttyc7 apm crypto pf pctr - R systrace wd0 wd1 wd2 wd3 raid0 raid1 raid2 raid3 std st0 st1 - R fd + R systrace wd0 wd1 wd2 wd3 std st0 st1 fd ;; -wd*|sd*|raid*) +wd*|sd*) 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;; esac ;; diff --git a/src/etc/etc.armish/MAKEDEV b/src/etc/etc.armish/MAKEDEV index 544ece66..34eb9ced 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.23 2011/10/22 19:31:23 miod Exp -# OpenBSD: MAKEDEV.common,v 1.58 2011/10/22 19:31:20 miod Exp +# OpenBSD: etc.armish/MAKEDEV.md,v 1.24 2012/04/06 15:18:41 jsing Exp +# OpenBSD: MAKEDEV.common,v 1.59 2012/04/06 15:18:41 jsing 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 # @@ -32,7 +32,6 @@ # Disks: # cd* ATAPI and SCSI CD-ROM drives # ch* SCSI media changers -# raid* RAIDframe disk devices # rd* "rd" pseudo-disks # sd* SCSI disks, including flopticals # vnd* "file" pseudo-disk devices @@ -507,15 +506,13 @@ all) 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 uk0 random lkm tty00 tty01 tty02 - R tty03 apm crypto pf systrace wd0 wd1 wd2 wd3 raid0 raid1 - R raid2 raid3 std st0 st1 fd + R tty03 apm crypto pf systrace wd0 wd1 wd2 wd3 std st0 st1 fd ;; -wd*|sd*|raid*) +wd*|sd*) 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;; esac ;; diff --git a/src/etc/etc.aviion/MAKEDEV b/src/etc/etc.aviion/MAKEDEV index c22c77ae..6bf74f06 100644 --- a/src/etc/etc.aviion/MAKEDEV +++ b/src/etc/etc.aviion/MAKEDEV @@ -4,7 +4,7 @@ # generated from: # # 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.common,v 1.59 2012/04/06 15:18:41 jsing 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 # diff --git a/src/etc/etc.beagle/MAKEDEV b/src/etc/etc.beagle/MAKEDEV index ddeb337f..1af31dc0 100644 --- a/src/etc/etc.beagle/MAKEDEV +++ b/src/etc/etc.beagle/MAKEDEV @@ -3,8 +3,8 @@ # THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. # generated from: # -# 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: etc.beagle/MAKEDEV.md,v 1.2 2012/04/06 15:18:41 jsing Exp +# OpenBSD: MAKEDEV.common,v 1.59 2012/04/06 15:18:41 jsing 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 # @@ -32,7 +32,6 @@ # Disks: # cd* ATAPI and SCSI CD-ROM drives # ch* SCSI media changers -# raid* RAIDframe disk devices # rd* "rd" pseudo-disks # sd* SCSI disks, including flopticals # vnd* "file" pseudo-disk devices @@ -505,17 +504,15 @@ all) 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 + R rmidi5 rmidi6 rmidi7 tuner0 radio0 music0 video0 video1 uk0 + R random lkm tty00 tty01 tty02 tty03 apm crypto pf systrace + R wd0 wd1 wd2 wd3 std st0 st1 fd ;; -wd*|sd*|raid*) +wd*|sd*) 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;; esac ;; diff --git a/src/etc/etc.hp300/MAKEDEV b/src/etc/etc.hp300/MAKEDEV index dc20d80d..dfd768d7 100644 --- a/src/etc/etc.hp300/MAKEDEV +++ b/src/etc/etc.hp300/MAKEDEV @@ -4,7 +4,7 @@ # generated from: # # OpenBSD: etc.hp300/MAKEDEV.md,v 1.44 2011/12/21 23:12:24 miod Exp -# OpenBSD: MAKEDEV.common,v 1.58 2011/10/22 19:31:20 miod Exp +# OpenBSD: MAKEDEV.common,v 1.59 2012/04/06 15:18:41 jsing 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 # diff --git a/src/etc/etc.hppa/MAKEDEV b/src/etc/etc.hppa/MAKEDEV index bbbd0533..0476ac59 100644 --- a/src/etc/etc.hppa/MAKEDEV +++ b/src/etc/etc.hppa/MAKEDEV @@ -4,7 +4,7 @@ # generated from: # # OpenBSD: etc.hppa/MAKEDEV.md,v 1.47 2011/10/22 19:31:23 miod Exp -# OpenBSD: MAKEDEV.common,v 1.58 2011/10/22 19:31:20 miod Exp +# OpenBSD: MAKEDEV.common,v 1.59 2012/04/06 15:18:41 jsing 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 # diff --git a/src/etc/etc.hppa64/MAKEDEV b/src/etc/etc.hppa64/MAKEDEV index ef3faab8..219496dd 100644 --- a/src/etc/etc.hppa64/MAKEDEV +++ b/src/etc/etc.hppa64/MAKEDEV @@ -4,7 +4,7 @@ # generated from: # # OpenBSD: etc.hppa64/MAKEDEV.md,v 1.24 2011/10/22 19:31:23 miod Exp -# OpenBSD: MAKEDEV.common,v 1.58 2011/10/22 19:31:20 miod Exp +# OpenBSD: MAKEDEV.common,v 1.59 2012/04/06 15:18:41 jsing 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 # diff --git a/src/etc/etc.i386/MAKEDEV b/src/etc/etc.i386/MAKEDEV index 0c636d1d..6f19f5ec 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.61 2011/10/22 19:31:23 miod Exp -# OpenBSD: MAKEDEV.common,v 1.58 2011/10/22 19:31:20 miod Exp +# OpenBSD: etc.i386/MAKEDEV.md,v 1.62 2012/04/06 15:18:41 jsing Exp +# OpenBSD: MAKEDEV.common,v 1.59 2012/04/06 15:18:41 jsing 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 # @@ -32,7 +32,6 @@ # Disks: # cd* ATAPI and SCSI CD-ROM drives # fd* Floppy disk drives (3 1/2", 5 1/4") -# raid* RAIDframe disk devices # rd* "rd" pseudo-disks # sd* SCSI disks, including flopticals # vnd* "file" pseudo-disk devices @@ -607,15 +606,13 @@ all) R tuner0 radio0 music0 speaker video0 video1 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 + R crypto pf pctr systrace wd0 wd1 wd2 wd3 std st0 st1 fd ;; -wd*|sd*|raid*) +wd*|sd*) 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;; esac ;; diff --git a/src/etc/etc.landisk/MAKEDEV b/src/etc/etc.landisk/MAKEDEV index e4c66072..af7997eb 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.25 2011/10/22 19:31:23 miod Exp -# OpenBSD: MAKEDEV.common,v 1.58 2011/10/22 19:31:20 miod Exp +# OpenBSD: etc.landisk/MAKEDEV.md,v 1.26 2012/04/06 15:18:41 jsing Exp +# OpenBSD: MAKEDEV.common,v 1.59 2012/04/06 15:18:41 jsing 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 # @@ -32,7 +32,6 @@ # Disks: # cd* ATAPI and SCSI CD-ROM drives # ch* SCSI media changers -# raid* RAIDframe disk devices # rd* "rd" pseudo-disks # sd* SCSI disks, including flopticals # vnd* "file" pseudo-disk devices @@ -483,14 +482,13 @@ all) R ptm local wscons pci0 pci1 pci2 pci3 uall rmidi0 rmidi1 R rmidi2 rmidi3 rmidi4 rmidi5 rmidi6 rmidi7 radio0 music0 R video0 video1 uk0 random lkm crypto pf systrace wd0 wd1 wd2 - R wd3 raid0 raid1 raid2 raid3 std st0 st1 fd + R wd3 std st0 st1 fd ;; -wd*|sd*|raid*) +wd*|sd*) 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;; esac ;; diff --git a/src/etc/etc.loongson/MAKEDEV b/src/etc/etc.loongson/MAKEDEV index 71b79381..c4c23b6a 100644 --- a/src/etc/etc.loongson/MAKEDEV +++ b/src/etc/etc.loongson/MAKEDEV @@ -4,7 +4,7 @@ # generated from: # # OpenBSD: etc.loongson/MAKEDEV.md,v 1.12 2011/10/22 19:31:23 miod Exp -# OpenBSD: MAKEDEV.common,v 1.58 2011/10/22 19:31:20 miod Exp +# OpenBSD: MAKEDEV.common,v 1.59 2012/04/06 15:18:41 jsing 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 # diff --git a/src/etc/etc.luna88k/MAKEDEV b/src/etc/etc.luna88k/MAKEDEV index 89d43600..9a53d094 100644 --- a/src/etc/etc.luna88k/MAKEDEV +++ b/src/etc/etc.luna88k/MAKEDEV @@ -4,7 +4,7 @@ # generated from: # # 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.common,v 1.59 2012/04/06 15:18:41 jsing 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 # diff --git a/src/etc/etc.mac68k/MAKEDEV b/src/etc/etc.mac68k/MAKEDEV index 05864642..a14b8cb9 100644 --- a/src/etc/etc.mac68k/MAKEDEV +++ b/src/etc/etc.mac68k/MAKEDEV @@ -4,7 +4,7 @@ # generated from: # # 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.common,v 1.59 2012/04/06 15:18:41 jsing 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 # diff --git a/src/etc/etc.macppc/MAKEDEV b/src/etc/etc.macppc/MAKEDEV index 79cc2620..75646a1d 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.48 2011/10/22 19:31:23 miod Exp -# OpenBSD: MAKEDEV.common,v 1.58 2011/10/22 19:31:20 miod Exp +# OpenBSD: etc.macppc/MAKEDEV.md,v 1.49 2012/04/06 15:18:41 jsing Exp +# OpenBSD: MAKEDEV.common,v 1.59 2012/04/06 15:18:41 jsing 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 # @@ -31,7 +31,6 @@ # local Configuration specific devices # Disks: # cd* ATAPI and SCSI CD-ROM drives -# raid* RAIDframe disk devices # rd* "rd" pseudo-disks # sd* SCSI disks, including flopticals # vnd* "file" pseudo-disk devices @@ -539,14 +538,13 @@ all) R pci3 iop0 iop1 uall rmidi0 rmidi1 rmidi2 rmidi3 rmidi4 R rmidi5 rmidi6 rmidi7 tuner0 radio0 music0 video0 video1 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 + R wd0 wd1 wd2 wd3 std st0 st1 fd ;; -wd*|sd*|raid*) +wd*|sd*) 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;; esac ;; diff --git a/src/etc/etc.mvme68k/MAKEDEV b/src/etc/etc.mvme68k/MAKEDEV index 275b10c1..bc78e516 100644 --- a/src/etc/etc.mvme68k/MAKEDEV +++ b/src/etc/etc.mvme68k/MAKEDEV @@ -4,7 +4,7 @@ # generated from: # # 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.common,v 1.59 2012/04/06 15:18:41 jsing 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 # diff --git a/src/etc/etc.mvme88k/MAKEDEV b/src/etc/etc.mvme88k/MAKEDEV index 3b6bfca9..d5fa6657 100644 --- a/src/etc/etc.mvme88k/MAKEDEV +++ b/src/etc/etc.mvme88k/MAKEDEV @@ -4,7 +4,7 @@ # generated from: # # 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.common,v 1.59 2012/04/06 15:18:41 jsing 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 # diff --git a/src/etc/etc.palm/MAKEDEV b/src/etc/etc.palm/MAKEDEV index b2c6b7c1..aabc747c 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.10 2011/10/22 19:31:23 miod Exp -# OpenBSD: MAKEDEV.common,v 1.58 2011/10/22 19:31:20 miod Exp +# OpenBSD: etc.palm/MAKEDEV.md,v 1.11 2012/04/06 15:18:41 jsing Exp +# OpenBSD: MAKEDEV.common,v 1.59 2012/04/06 15:18:41 jsing 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 # @@ -32,7 +32,6 @@ # Disks: # cd* ATAPI and SCSI CD-ROM drives # ch* SCSI media changers -# raid* RAIDframe disk devices # rd* "rd" pseudo-disks # sd* SCSI disks, including flopticals # vnd* "file" pseudo-disk devices @@ -495,15 +494,14 @@ all) R nnpfs0 ch0 audio0 audio1 audio2 hotplug ptm local wscons R uall rmidi0 rmidi1 rmidi2 rmidi3 rmidi4 rmidi5 rmidi6 rmidi7 R tuner0 radio0 music0 video0 video1 uk0 random lkm tty00 - R tty01 tty02 tty03 apm crypto pf systrace wd0 wd1 wd2 wd3 - R raid0 raid1 raid2 raid3 std st0 st1 fd + R tty01 tty02 tty03 apm crypto pf systrace wd0 wd1 wd2 wd3 std + R st0 st1 fd ;; -wd*|sd*|raid*) +wd*|sd*) 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;; esac ;; diff --git a/src/etc/etc.sgi/MAKEDEV b/src/etc/etc.sgi/MAKEDEV index 7dd23900..5f06c791 100644 --- a/src/etc/etc.sgi/MAKEDEV +++ b/src/etc/etc.sgi/MAKEDEV @@ -4,7 +4,7 @@ # generated from: # # OpenBSD: etc.sgi/MAKEDEV.md,v 1.36 2012/03/28 20:44:23 miod Exp -# OpenBSD: MAKEDEV.common,v 1.58 2011/10/22 19:31:20 miod Exp +# OpenBSD: MAKEDEV.common,v 1.59 2012/04/06 15:18:41 jsing 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 # diff --git a/src/etc/etc.socppc/MAKEDEV b/src/etc/etc.socppc/MAKEDEV index eb4b0879..4a96a618 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.15 2011/10/06 20:49:27 deraadt Exp -# OpenBSD: MAKEDEV.common,v 1.57 2011/10/06 20:49:25 deraadt Exp +# OpenBSD: etc.socppc/MAKEDEV.md,v 1.17 2012/04/06 15:18:41 jsing Exp +# OpenBSD: MAKEDEV.common,v 1.59 2012/04/06 15:18:41 jsing 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 # @@ -31,7 +31,6 @@ # local Configuration specific devices # Disks: # cd* ATAPI and SCSI CD-ROM drives -# raid* RAIDframe disk devices # rd* "rd" pseudo-disks # sd* SCSI disks, including flopticals # vnd* "file" pseudo-disk devices @@ -435,14 +434,13 @@ all) 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 + R wd0 wd1 wd2 wd3 std st0 st1 fd ;; -wd*|sd*|raid*) +wd*|sd*) 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;; esac ;; diff --git a/src/etc/etc.sparc/MAKEDEV b/src/etc/etc.sparc/MAKEDEV index c41295e5..2bfb1128 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.48 2011/10/22 19:31:23 miod Exp -# OpenBSD: MAKEDEV.common,v 1.58 2011/10/22 19:31:20 miod Exp +# OpenBSD: etc.sparc/MAKEDEV.md,v 1.49 2012/04/06 15:18:41 jsing Exp +# OpenBSD: MAKEDEV.common,v 1.59 2012/04/06 15:18:41 jsing 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 # @@ -34,7 +34,6 @@ # fd* Floppy disk drives (3 1/2", 5 1/4") # presto* Prestoserve NVRAM memory # sd* SCSI disks, including flopticals -# raid* RAIDframe disk devices # rd* "rd" pseudo-disks # vnd* "file" pseudo-disk devices # xd* Xylogic 753/7053 disks @@ -526,16 +525,15 @@ all) R diskmap vscsi0 nnpfs0 ch0 bio cuaa cuab cuac cuad ttya ttyb R ttyc ttyd audio0 audio1 audio2 hotplug ptm local wscons uk0 R random lkm tty00 tty01 tty02 tty03 apm pf systrace xd0 xd1 - R xd2 xd3 raid0 raid1 raid2 raid3 std st0 st1 fd + R xd2 xd3 std st0 st1 fd ;; -presto*|xd*|xy*|sd*|raid*) +presto*|xd*|xy*|sd*) 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;; esac ;; diff --git a/src/etc/etc.sparc64/MAKEDEV b/src/etc/etc.sparc64/MAKEDEV index 73e2698f..dbfb45f5 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.64 2011/10/22 19:31:23 miod Exp -# OpenBSD: MAKEDEV.common,v 1.58 2011/10/22 19:31:20 miod Exp +# OpenBSD: etc.sparc64/MAKEDEV.md,v 1.65 2012/04/06 15:18:41 jsing Exp +# OpenBSD: MAKEDEV.common,v 1.59 2012/04/06 15:18:41 jsing 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 # @@ -32,7 +32,6 @@ # Disks: # cd* ATAPI and SCSI CD-ROM drives # fd* Floppy disk drives (3 1/2", 5 1/4") -# raid* RAIDframe disk devices # rd* "rd" pseudo-disks # sd* SCSI disks, including flopticals # vnd* "file" pseudo-disk devices @@ -625,14 +624,13 @@ all) R uall rmidi0 rmidi1 rmidi2 rmidi3 rmidi4 rmidi5 rmidi6 rmidi7 R video0 video1 uk0 random lpa0 lpa1 lpa2 lpt0 lpt1 lpt2 lkm R tty00 tty01 tty02 tty03 ttyh0 ttyh1 crypto pf systrace wd0 - R wd1 wd2 wd3 raid0 raid1 raid2 raid3 std st0 st1 fd + R wd1 wd2 wd3 std st0 st1 fd ;; -wd*|sd*|raid*) +wd*|sd*) 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;; esac ;; diff --git a/src/etc/etc.vax/MAKEDEV b/src/etc/etc.vax/MAKEDEV index eb23a5a2..0289e3aa 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.47 2011/10/22 19:31:23 miod Exp -# OpenBSD: MAKEDEV.common,v 1.58 2011/10/22 19:31:20 miod Exp +# OpenBSD: etc.vax/MAKEDEV.md,v 1.48 2012/04/06 15:18:41 jsing Exp +# OpenBSD: MAKEDEV.common,v 1.59 2012/04/06 15:18:41 jsing 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 # @@ -33,7 +33,6 @@ # cd* ATAPI and SCSI CD-ROM drives # hd* HDC9224 disks # ra* MSCP disks -# raid* RAIDframe disk devices # rd* "rd" pseudo-disks # rx* RX02 floppy disks # sd* SCSI disks, including flopticals @@ -475,15 +474,14 @@ all) 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 audio0 ptm local wscons uk0 - R random lkm pf systrace rx0 rx1 ra0 ra1 ra2 ra3 raid0 raid1 - R raid2 raid3 std st0 st1 fd + R random lkm pf systrace rx0 rx1 ra0 ra1 ra2 ra3 std st0 st1 + R fd ;; -sd*|rx*|raid*|ra*|hd*) +sd*|rx*|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;; esac diff --git a/src/etc/etc.zaurus/MAKEDEV b/src/etc/etc.zaurus/MAKEDEV index ab8857f1..4f0c8bdf 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.29 2011/10/06 20:49:27 deraadt Exp -# OpenBSD: MAKEDEV.common,v 1.58 2011/10/22 19:31:20 miod Exp +# OpenBSD: etc.zaurus/MAKEDEV.md,v 1.30 2012/04/06 15:18:41 jsing Exp +# OpenBSD: MAKEDEV.common,v 1.59 2012/04/06 15:18:41 jsing 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 # @@ -32,7 +32,6 @@ # Disks: # cd* ATAPI and SCSI CD-ROM drives # ch* SCSI media changers -# raid* RAIDframe disk devices # rd* "rd" pseudo-disks # sd* SCSI disks, including flopticals # vnd* "file" pseudo-disk devices @@ -495,15 +494,14 @@ all) 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 uk0 random lkm tty00 - R tty01 tty02 tty03 apm crypto pf systrace wd0 wd1 wd2 wd3 - R raid0 raid1 raid2 raid3 std st0 st1 fd + R tty01 tty02 tty03 apm crypto pf systrace wd0 wd1 wd2 wd3 std + R st0 st1 fd ;; -wd*|sd*|raid*) +wd*|sd*) 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;; esac ;;