From ddb0d5c92a8df46f8e96a616b52683230cb73cce Mon Sep 17 00:00:00 2001 From: deraadt <> Date: Sun, 17 Feb 2002 05:14:55 +0000 Subject: [PATCH] sync --- src/etc/etc.alpha/MAKEDEV | 12 ++++++------ src/etc/etc.amiga/MAKEDEV | 10 +++++----- src/etc/etc.hp300/MAKEDEV | 10 +++++----- src/etc/etc.hppa/MAKEDEV | 10 +++++----- src/etc/etc.i386/MAKEDEV | 22 ++++++++-------------- src/etc/etc.mac68k/MAKEDEV | 8 ++++---- src/etc/etc.macppc/MAKEDEV | 10 +++++----- src/etc/etc.sparc/MAKEDEV | 14 +++++++------- src/etc/etc.sparc64/MAKEDEV | 12 ++++++------ src/etc/etc.sun3/MAKEDEV | 10 +++++----- 10 files changed, 56 insertions(+), 62 deletions(-) diff --git a/src/etc/etc.alpha/MAKEDEV b/src/etc/etc.alpha/MAKEDEV index 4a1bec98..b83045c0 100644 --- a/src/etc/etc.alpha/MAKEDEV +++ b/src/etc/etc.alpha/MAKEDEV @@ -4,12 +4,12 @@ # generated from: # # OpenBSD: etc.alpha/MAKEDEV.md,v 1.8 2002/02/14 13:29:20 todd Exp -# OpenBSD: MAKEDEV.mi,v 1.32 2002/02/15 21:13:47 todd Exp -# OpenBSD: MAKEDEV.sub,v 1.6 2002/02/14 05:50:37 todd Exp +# OpenBSD: MAKEDEV.mi,v 1.34 2002/02/17 05:14:30 deraadt Exp +# OpenBSD: MAKEDEV.sub,v 1.7 2002/02/16 01:19:52 deraadt Exp # -# $OpenBSD: MAKEDEV,v 1.76 2002/02/15 21:16:02 todd Exp $ +# $OpenBSD: MAKEDEV,v 1.77 2002/02/17 05:14:54 deraadt Exp $ # -# Copyright (c) 2001 Todd T. Fries +# Copyright (c) 2001,2002 Todd T. Fries # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -34,7 +34,7 @@ # Device "make" file. Valid arguments: # all makes all known devices, including local devices. # Tries to make the ``standard'' number of each type. -# ramdisk devices to be put on install floppies +# ramdisk devices to be put on ramdisk-based media # std standard devices # local configuration specific devices # Tapes: @@ -45,7 +45,7 @@ # vnd* "file" pseudo-disks # ccd* concatenated disk devices # wd* "winchester" disk drives (ST506, IDE, ESDI, RLL, ...) -# rd* "ramdisk" pseudo-disks +# rd* "rd" pseudo-disks # raid* RAIDframe disk devices # fd* Floppy disk drives (3 1/2", 5 1/4") # Terminal ports: diff --git a/src/etc/etc.amiga/MAKEDEV b/src/etc/etc.amiga/MAKEDEV index ffcf18b2..9cc23a65 100644 --- a/src/etc/etc.amiga/MAKEDEV +++ b/src/etc/etc.amiga/MAKEDEV @@ -4,12 +4,12 @@ # generated from: # # OpenBSD: etc.amiga/MAKEDEV.md,v 1.5 2002/02/14 13:29:20 todd Exp -# OpenBSD: MAKEDEV.mi,v 1.32 2002/02/15 21:13:47 todd Exp -# OpenBSD: MAKEDEV.sub,v 1.6 2002/02/14 05:50:37 todd Exp +# OpenBSD: MAKEDEV.mi,v 1.34 2002/02/17 05:14:30 deraadt Exp +# OpenBSD: MAKEDEV.sub,v 1.7 2002/02/16 01:19:52 deraadt Exp # -# $OpenBSD: MAKEDEV,v 1.57 2002/02/15 21:16:02 todd Exp $ +# $OpenBSD: MAKEDEV,v 1.58 2002/02/17 05:14:54 deraadt Exp $ # -# Copyright (c) 2001 Todd T. Fries +# Copyright (c) 2001,2002 Todd T. Fries # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -41,7 +41,7 @@ # Disks: # ramdisk devices needed for install floppies # sd* SCSI disks -# rd* "ramdisk" pseudo-disks +# rd* "rd" pseudo-disks # ccd* concatenated disk devices # wd* "winchester" disk drives (ST506, IDE, ESDI, RLL, ...) # cd* SCSI cdrom drives diff --git a/src/etc/etc.hp300/MAKEDEV b/src/etc/etc.hp300/MAKEDEV index 84299dad..85b493de 100644 --- a/src/etc/etc.hp300/MAKEDEV +++ b/src/etc/etc.hp300/MAKEDEV @@ -4,12 +4,12 @@ # generated from: # # OpenBSD: etc.hp300/MAKEDEV.md,v 1.4 2002/02/14 13:29:20 todd Exp -# OpenBSD: MAKEDEV.mi,v 1.32 2002/02/15 21:13:47 todd Exp -# OpenBSD: MAKEDEV.sub,v 1.6 2002/02/14 05:50:37 todd Exp +# OpenBSD: MAKEDEV.mi,v 1.34 2002/02/17 05:14:30 deraadt Exp +# OpenBSD: MAKEDEV.sub,v 1.7 2002/02/16 01:19:52 deraadt Exp # -# $OpenBSD: MAKEDEV,v 1.43 2002/02/15 21:16:02 todd Exp $ +# $OpenBSD: MAKEDEV,v 1.44 2002/02/17 05:14:55 deraadt Exp $ # -# Copyright (c) 2001 Todd T. Fries +# Copyright (c) 2001,2002 Todd T. Fries # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -45,7 +45,7 @@ # hd* HP300 HP-IB disks # sd* SCSI disks # vnd* "file" pseudo-disks -# rd* "ramdisk" pseudo-disks +# rd* "rd" pseudo-disks # Terminal multiplexers: # dca* HP200/300 single port serial interface # dcm* HP200/300 4 port serial mux interface diff --git a/src/etc/etc.hppa/MAKEDEV b/src/etc/etc.hppa/MAKEDEV index ad3c00e2..5a9a0828 100644 --- a/src/etc/etc.hppa/MAKEDEV +++ b/src/etc/etc.hppa/MAKEDEV @@ -4,12 +4,12 @@ # generated from: # # OpenBSD: etc.hppa/MAKEDEV.md,v 1.4 2002/02/14 13:29:20 todd Exp -# OpenBSD: MAKEDEV.mi,v 1.32 2002/02/15 21:13:47 todd Exp -# OpenBSD: MAKEDEV.sub,v 1.6 2002/02/14 05:50:37 todd Exp +# OpenBSD: MAKEDEV.mi,v 1.34 2002/02/17 05:14:30 deraadt Exp +# OpenBSD: MAKEDEV.sub,v 1.7 2002/02/16 01:19:52 deraadt Exp # -# $OpenBSD: MAKEDEV,v 1.15 2002/02/15 21:16:02 todd Exp $ +# $OpenBSD: MAKEDEV,v 1.16 2002/02/17 05:14:55 deraadt Exp $ # -# Copyright (c) 2001 Todd T. Fries +# Copyright (c) 2001,2002 Todd T. Fries # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -44,7 +44,7 @@ # cd* SCSI cdrom drives # ccd* concatenated disk devices # vnd* "file" pseudo-disks -# rd* "ramdisk" pseudo-disks +# rd* "rd" pseudo-disks # Terminal ports: # tty0* NS16x50 serial ports # Pseudo terminals: diff --git a/src/etc/etc.i386/MAKEDEV b/src/etc/etc.i386/MAKEDEV index 133ffcce..d3fab36b 100644 --- a/src/etc/etc.i386/MAKEDEV +++ b/src/etc/etc.i386/MAKEDEV @@ -3,13 +3,13 @@ # THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. # generated from: # -# OpenBSD: etc.i386/MAKEDEV.md,v 1.4 2002/02/14 13:29:20 todd Exp -# OpenBSD: MAKEDEV.mi,v 1.32 2002/02/15 21:13:47 todd Exp -# OpenBSD: MAKEDEV.sub,v 1.6 2002/02/14 05:50:37 todd Exp +# OpenBSD: etc.i386/MAKEDEV.md,v 1.5 2002/02/17 05:14:30 deraadt Exp +# OpenBSD: MAKEDEV.mi,v 1.34 2002/02/17 05:14:30 deraadt Exp +# OpenBSD: MAKEDEV.sub,v 1.7 2002/02/16 01:19:52 deraadt Exp # -# $OpenBSD: MAKEDEV,v 1.120 2002/02/15 21:16:02 todd Exp $ +# $OpenBSD: MAKEDEV,v 1.121 2002/02/17 05:14:55 deraadt Exp $ # -# Copyright (c) 2001 Todd T. Fries +# Copyright (c) 2001,2002 Todd T. Fries # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -34,9 +34,8 @@ # Device "make" file. Valid arguments: # all makes all known devices, including local devices. # Tries to make the ``standard'' number of each type. -# ramdisk devices to be put on install floppies +# ramdisk devices to be put on ramdisk-based media # std standard devices -# ramdisk makes all devices for a ramdisk kernel # local configuration specific devices # Tapes: # wt* QIC-interface (e.g. not SCSI) 3M cartridge tape @@ -49,7 +48,7 @@ # cd* SCSI cdrom drives # mcd* Mitsumi cdrom drives # vnd* "file" pseudo-disks -# rd* "ramdisk" pseudo-disks +# rd* "rd" pseudo-disks # ccd* concatenated disk devices # raid* RAIDframe disk devices # Console ports: @@ -222,7 +221,7 @@ U=`unt $i` case $i in ramdisk) - R std wt0 fd0 wd0 wd1 sd0 sd1 tty00 tty01 rd0 + R std bpf0 fd0 wd0 wd1 sd0 sd1 tty00 tty01 rd0 R st0 cd0 ttyC0 random ;; @@ -553,11 +552,6 @@ local) test -s $T.local && sh $T.local ;; -ramdisk) - R bpf0 std mcd0 st0 st1 cd0 cd1 sd0 sd1 sd2 sd3 wd0 wd1 wd2 - R wd3 rd0 wt0 ttyC0 - ;; - all) R ccd0 ccd1 ccd2 ccd3 vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4 R cd0 cd1 rd0 tun0 tun1 tun2 tun3 bpf0 bpf1 bpf2 bpf3 bpf4 diff --git a/src/etc/etc.mac68k/MAKEDEV b/src/etc/etc.mac68k/MAKEDEV index 4ad9c717..0e4a17b0 100644 --- a/src/etc/etc.mac68k/MAKEDEV +++ b/src/etc/etc.mac68k/MAKEDEV @@ -4,12 +4,12 @@ # generated from: # # OpenBSD: etc.mac68k/MAKEDEV.md,v 1.4 2002/02/14 13:29:20 todd Exp -# OpenBSD: MAKEDEV.mi,v 1.32 2002/02/15 21:13:47 todd Exp -# OpenBSD: MAKEDEV.sub,v 1.6 2002/02/14 05:50:37 todd Exp +# OpenBSD: MAKEDEV.mi,v 1.34 2002/02/17 05:14:30 deraadt Exp +# OpenBSD: MAKEDEV.sub,v 1.7 2002/02/16 01:19:52 deraadt Exp # -# $OpenBSD: MAKEDEV,v 1.47 2002/02/15 21:16:02 todd Exp $ +# $OpenBSD: MAKEDEV,v 1.48 2002/02/17 05:14:55 deraadt Exp $ # -# Copyright (c) 2001 Todd T. Fries +# Copyright (c) 2001,2002 Todd T. Fries # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/src/etc/etc.macppc/MAKEDEV b/src/etc/etc.macppc/MAKEDEV index 481c367f..5f40265c 100644 --- a/src/etc/etc.macppc/MAKEDEV +++ b/src/etc/etc.macppc/MAKEDEV @@ -4,12 +4,12 @@ # generated from: # # OpenBSD: etc.macppc/MAKEDEV.md,v 1.4 2002/02/14 13:29:20 todd Exp -# OpenBSD: MAKEDEV.mi,v 1.32 2002/02/15 21:13:47 todd Exp -# OpenBSD: MAKEDEV.sub,v 1.6 2002/02/14 05:50:37 todd Exp +# OpenBSD: MAKEDEV.mi,v 1.34 2002/02/17 05:14:30 deraadt Exp +# OpenBSD: MAKEDEV.sub,v 1.7 2002/02/16 01:19:52 deraadt Exp # -# $OpenBSD: MAKEDEV,v 1.17 2002/02/15 21:16:02 todd Exp $ +# $OpenBSD: MAKEDEV,v 1.18 2002/02/17 05:14:55 deraadt Exp $ # -# Copyright (c) 2001 Todd T. Fries +# Copyright (c) 2001,2002 Todd T. Fries # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -46,7 +46,7 @@ # cd* SCSI cdrom drives # ch* SCSI media changer # vnd* "file" pseudo-disks -# rd* "ramdisk" pseudo-disks +# rd* "rd" pseudo-disks # raid* RAIDframe disk devices # ccd* concatenated disk devices # Console ports: diff --git a/src/etc/etc.sparc/MAKEDEV b/src/etc/etc.sparc/MAKEDEV index 08041a8f..51a0bc1d 100644 --- a/src/etc/etc.sparc/MAKEDEV +++ b/src/etc/etc.sparc/MAKEDEV @@ -3,13 +3,13 @@ # THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. # generated from: # -# OpenBSD: etc.sparc/MAKEDEV.md,v 1.8 2002/02/14 13:29:20 todd Exp -# OpenBSD: MAKEDEV.mi,v 1.32 2002/02/15 21:13:47 todd Exp -# OpenBSD: MAKEDEV.sub,v 1.6 2002/02/14 05:50:37 todd Exp +# OpenBSD: etc.sparc/MAKEDEV.md,v 1.9 2002/02/17 05:14:30 deraadt Exp +# OpenBSD: MAKEDEV.mi,v 1.34 2002/02/17 05:14:30 deraadt Exp +# OpenBSD: MAKEDEV.sub,v 1.7 2002/02/16 01:19:52 deraadt Exp # -# $OpenBSD: MAKEDEV,v 1.85 2002/02/15 21:16:02 todd Exp $ +# $OpenBSD: MAKEDEV,v 1.86 2002/02/17 05:14:55 deraadt Exp $ # -# Copyright (c) 2001 Todd T. Fries +# Copyright (c) 2001,2002 Todd T. Fries # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -45,7 +45,7 @@ # uk* SCSI Unknown device # ss* SCSI scanners # xy* Xylogic 450/451 disks -# rd* "ramdisk" pseudo-disks +# rd* "rd" pseudo-disks # xd* Xylogic 753/7053 disks # fd* Floppy disk drives (3 1/2", 5 1/4") # vnd* "file" pseudo-disks @@ -197,7 +197,7 @@ U=`unt $i` case $i in ramdisk) - R std random + R std random bpf0 R fd0 sd0 sd1 rd0 ;; diff --git a/src/etc/etc.sparc64/MAKEDEV b/src/etc/etc.sparc64/MAKEDEV index d34027cc..9be9ea91 100644 --- a/src/etc/etc.sparc64/MAKEDEV +++ b/src/etc/etc.sparc64/MAKEDEV @@ -4,12 +4,12 @@ # generated from: # # OpenBSD: etc.sparc64/MAKEDEV.md,v 1.17 2002/02/14 13:29:21 todd Exp -# OpenBSD: MAKEDEV.mi,v 1.32 2002/02/15 21:13:47 todd Exp -# OpenBSD: MAKEDEV.sub,v 1.6 2002/02/14 05:50:37 todd Exp +# OpenBSD: MAKEDEV.mi,v 1.34 2002/02/17 05:14:30 deraadt Exp +# OpenBSD: MAKEDEV.sub,v 1.7 2002/02/16 01:19:52 deraadt Exp # -# $OpenBSD: MAKEDEV,v 1.56 2002/02/15 21:16:02 todd Exp $ +# $OpenBSD: MAKEDEV,v 1.57 2002/02/17 05:14:55 deraadt Exp $ # -# Copyright (c) 2001 Todd T. Fries +# Copyright (c) 2001,2002 Todd T. Fries # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -34,7 +34,7 @@ # Device "make" file. Valid arguments: # all makes all known devices, including local devices. # Tries to make the ``standard'' number of each type. -# ramdisk devices to be put on install floppies +# ramdisk devices to be put on ramdisk-based media # std standard devices # local configuration specific devices # Tapes: @@ -46,7 +46,7 @@ # sd* SCSI disks # cd* SCSI cdrom drives # vnd* "file" pseudo-disks -# rd* "ramdisk" pseudo-disks +# rd* "rd" pseudo-disks # ccd* concatenated disk devices # raid* RAIDframe disk devices # Console ports: diff --git a/src/etc/etc.sun3/MAKEDEV b/src/etc/etc.sun3/MAKEDEV index 1fc252ca..4e869b86 100644 --- a/src/etc/etc.sun3/MAKEDEV +++ b/src/etc/etc.sun3/MAKEDEV @@ -4,12 +4,12 @@ # generated from: # # OpenBSD: etc.sun3/MAKEDEV.md,v 1.2 2002/02/14 13:29:21 todd Exp -# OpenBSD: MAKEDEV.mi,v 1.32 2002/02/15 21:13:47 todd Exp -# OpenBSD: MAKEDEV.sub,v 1.6 2002/02/14 05:50:37 todd Exp +# OpenBSD: MAKEDEV.mi,v 1.34 2002/02/17 05:14:30 deraadt Exp +# OpenBSD: MAKEDEV.sub,v 1.7 2002/02/16 01:19:52 deraadt Exp # -# $OpenBSD: MAKEDEV,v 1.51 2002/02/15 21:16:02 todd Exp $ +# $OpenBSD: MAKEDEV,v 1.52 2002/02/17 05:14:55 deraadt Exp $ # -# Copyright (c) 2001 Todd T. Fries +# Copyright (c) 2001,2002 Todd T. Fries # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -60,7 +60,7 @@ # bpf* Berkeley Packet Filter # pf* Packet Filter # tun* network tunnel driver -# rd* "ramdisk" pseudo-disks +# rd* "rd" pseudo-disks # *random inkernel random data source # uk* SCSI Unknown device # ss* SCSI scanners