From 4785830e5472ce41b80cf46f123a00026ec21cae Mon Sep 17 00:00:00 2001
From: deraadt <>
Date: Thu, 21 Feb 2002 18:34:11 +0000
Subject: [PATCH] Remove uncommited garbage.  I am sorry, but this was just not
 tested. It crashes sh, EVEN after that possible fix.  It appears to overflow
 the ramdisk _before_ it dumps core.  Noone was shown these changes.  They
 were just tossed in.  This is not a development process that will work, so I
 am just backing out all the changes in the last 24 hours.

---
 src/etc/etc.alpha/MAKEDEV   |  10 +-
 src/etc/etc.amiga/MAKEDEV   |  26 +-
 src/etc/etc.hp300/MAKEDEV   |   6 +-
 src/etc/etc.hppa/MAKEDEV    |  12 +-
 src/etc/etc.i386/MAKEDEV    |  16 +-
 src/etc/etc.mac68k/MAKEDEV  |   9 +-
 src/etc/etc.macppc/MAKEDEV  |  14 +-
 src/etc/etc.sparc/MAKEDEV   |   8 +-
 src/etc/etc.sparc64/MAKEDEV |   6 +-
 src/etc/etc.sun3/MAKEDEV    |  11 +-
 src/etc/etc.vax/MAKEDEV     | 953 ++++++++++++++++++++----------------
 11 files changed, 580 insertions(+), 491 deletions(-)

diff --git a/src/etc/etc.alpha/MAKEDEV b/src/etc/etc.alpha/MAKEDEV
index b826e689..8209bdb7 100644
--- a/src/etc/etc.alpha/MAKEDEV
+++ b/src/etc/etc.alpha/MAKEDEV
@@ -3,11 +3,11 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.alpha/MAKEDEV.md,v 1.9 2002/02/21 13:03:50 todd Exp 
-#	OpenBSD: MAKEDEV.mi,v 1.38 2002/02/21 13:41:55 todd Exp 
+#	OpenBSD: etc.alpha/MAKEDEV.md,v 1.8 2002/02/14 13:29:20 todd Exp 
+#	OpenBSD: MAKEDEV.mi,v 1.36 2002/02/19 21:05:10 todd Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.7 2002/02/16 01:19:52 deraadt Exp 
 #
-#	$OpenBSD: MAKEDEV,v 1.80 2002/02/21 13:44:12 todd Exp $
+#	$OpenBSD: MAKEDEV,v 1.81 2002/02/21 18:34:09 deraadt Exp $
 #
 # Copyright (c) 2001,2002 Todd T. Fries <todd@OpenBSD.org>
 # All rights reserved.
@@ -207,7 +207,7 @@ U=`unt $i`
 
 case $i in
 ramdisk)
-	R std fd0 wd0 sd0 sd1 sd2
+	R std fd0 wd0 wd1 sd0 sd1
 	R st0 cd0 ttyC0 random rd0
 	;;
 
@@ -494,7 +494,7 @@ all)
 	R fd1E fd1F fd1G fd1H fd0 fd0B fd0C fd0D fd0E fd0F fd0G fd0H
 	R xfs0 ss0 ss1 ch0 wscons pci iop0 iop1 usbs rmidi0 rmidi1
 	R rmidi2 rmidi3 rmidi4 rmidi5 rmidi6 rmidi7 music0 speaker
-	R audio0 uk1 uk0 random lpa0 lpa1 lpa2 lpt0 lpt1 lpt2 mmclock
+	R audio0 uk0 rndrandom lpa0 lpa1 lpa2 lpt0 lpt1 lpt2 mmclock
 	R lkm tty00 tty01 tty02 tty03 ttyc0 ttyc1 ttyc2 ttyc3 ttyc4
 	R ttyc5 ttyc6 ttyc7 ttyB0 ttyB1 ttyB2 ttyB3 ttyB4 ttyB5 pf
 	R altq wd0 wd1 wd2 wd3 raid0 raid1 raid2 raid3 std st0 st1 fd
diff --git a/src/etc/etc.amiga/MAKEDEV b/src/etc/etc.amiga/MAKEDEV
index fb0c64bb..ea45d517 100644
--- a/src/etc/etc.amiga/MAKEDEV
+++ b/src/etc/etc.amiga/MAKEDEV
@@ -3,11 +3,11 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.amiga/MAKEDEV.md,v 1.6 2002/02/21 13:04:18 todd Exp 
-#	OpenBSD: MAKEDEV.mi,v 1.38 2002/02/21 13:41:55 todd Exp 
+#	OpenBSD: etc.amiga/MAKEDEV.md,v 1.5 2002/02/14 13:29:20 todd Exp 
+#	OpenBSD: MAKEDEV.mi,v 1.36 2002/02/19 21:05:10 todd Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.7 2002/02/16 01:19:52 deraadt Exp 
 #
-#	$OpenBSD: MAKEDEV,v 1.61 2002/02/21 13:44:12 todd Exp $
+#	$OpenBSD: MAKEDEV,v 1.62 2002/02/21 18:34:11 deraadt Exp $
 #
 # Copyright (c) 2001,2002 Todd T. Fries <todd@OpenBSD.org>
 # All rights reserved.
@@ -80,7 +80,6 @@
 #	ch*	SCSI media changer
 #	altq/	ALTQ control interface
 #	fd	makes fd/* for the fdescfs
-#	view*	generic interface to graphic displays
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 T=$0
 
@@ -441,16 +440,15 @@ local)
 	;;
 
 all)
-	R ttyB0 ttyB1 ttyB2 ttyB3 ttyB4 ttyB5 ttyB6 ttyB7 ttyB8 ttyB9
-	R view00 view01 view02 view03 view04 view05 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 pty1 pty2 xfs0 ss0 ss1 ch0
-	R local kbd mouse0 mouse1 par0 grf0 grf1 grf2 grf3 grf4 grf5
-	R grf6 audio0 uk1 uk0 random joy0 joy1 lpa0 lpa1 lpa2 lpt0
-	R lpt1 lpt2 lkm ttye0 ttye1 ttye2 ttye3 ttye4 ttye5 ttye6
-	R tty00 tty01 tty02 tty03 ttyA0 ttyA1 pf altq fd0 fd1 fd2 fd3
-	R wd0 wd1 wd2 wd3 std st0 st1 fd
+	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 bpf0
+	R bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0 pty1 pty2
+	R xfs0 ss0 ss1 ch0 local kbd mouse0 mouse1 par0 grf0 grf1 grf2
+	R grf3 grf4 grf5 grf6 audio0 uk0 rndrandom joy0 joy1 lpa0 lpa1
+	R lpa2 lpt0 lpt1 lpt2 lkm ttye0 ttye1 ttye2 ttye3 ttye4 ttye5
+	R ttye6 tty00 tty01 tty02 tty03 ttyB0 ttyB1 ttyB2 ttyB3 ttyB4
+	R ttyA0 ttyA1 pf altq fd0 fd1 fd2 fd3 wd0 wd1 wd2 wd3 std st0
+	R st1 fd
 	;;
 
 wd*|sd*|ccd*)
diff --git a/src/etc/etc.hp300/MAKEDEV b/src/etc/etc.hp300/MAKEDEV
index 9aa9d937..93ad0d89 100644
--- a/src/etc/etc.hp300/MAKEDEV
+++ b/src/etc/etc.hp300/MAKEDEV
@@ -4,10 +4,10 @@
 # generated from:
 #
 #	OpenBSD: etc.hp300/MAKEDEV.md,v 1.4 2002/02/14 13:29:20 todd Exp 
-#	OpenBSD: MAKEDEV.mi,v 1.38 2002/02/21 13:41:55 todd Exp 
+#	OpenBSD: MAKEDEV.mi,v 1.36 2002/02/19 21:05:10 todd Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.7 2002/02/16 01:19:52 deraadt Exp 
 #
-#	$OpenBSD: MAKEDEV,v 1.47 2002/02/21 13:44:12 todd Exp $
+#	$OpenBSD: MAKEDEV,v 1.48 2002/02/21 18:34:11 deraadt Exp $
 #
 # Copyright (c) 2001,2002 Todd T. Fries <todd@OpenBSD.org>
 # All rights reserved.
@@ -425,7 +425,7 @@ all)
 	R st1 hil grf0 ccd0 ccd1 ccd2 ccd3 vnd0 vnd1 vnd2 vnd3 sd0 sd1
 	R sd2 sd3 sd4 rd0 tun0 tun1 tun2 tun3 bpf0 bpf1 bpf2 bpf3 bpf4
 	R bpf5 bpf6 bpf7 bpf8 bpf9 pty0 pty1 pty2 xfs0 local ppi0
-	R apci0 random lkm pf altq std fd
+	R apci0 rndrandom lkm pf altq std fd
 	;;
 
 sd*|hd*|ccd*)
diff --git a/src/etc/etc.hppa/MAKEDEV b/src/etc/etc.hppa/MAKEDEV
index 0fab4977..e083a682 100644
--- a/src/etc/etc.hppa/MAKEDEV
+++ b/src/etc/etc.hppa/MAKEDEV
@@ -3,11 +3,11 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.hppa/MAKEDEV.md,v 1.5 2002/02/21 13:06:48 todd Exp 
-#	OpenBSD: MAKEDEV.mi,v 1.38 2002/02/21 13:41:55 todd Exp 
+#	OpenBSD: etc.hppa/MAKEDEV.md,v 1.4 2002/02/14 13:29:20 todd Exp 
+#	OpenBSD: MAKEDEV.mi,v 1.36 2002/02/19 21:05:10 todd Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.7 2002/02/16 01:19:52 deraadt Exp 
 #
-#	$OpenBSD: MAKEDEV,v 1.19 2002/02/21 13:44:12 todd Exp $
+#	$OpenBSD: MAKEDEV,v 1.20 2002/02/21 18:34:11 deraadt Exp $
 #
 # Copyright (c) 2001,2002 Todd T. Fries <todd@OpenBSD.org>
 # All rights reserved.
@@ -54,6 +54,7 @@
 #	lpt*	IEEE 1284 centronics printer
 # Call units:
 # Special purpose devices:
+#	hil	HP300 HIL input devices
 #	fd	makes fd/* for the fdescfs
 #	bpf*	Berkeley Packet Filter
 #	tun*	network tunnel driver
@@ -183,7 +184,8 @@ U=`unt $i`
 case $i in
 ramdisk)
 	R std fd st0 st1 sd0 sd1 sd2 sd3 rd0
-	R pty0 bpf0 bpf1 tun0 tun1 lkm random
+	R pty0 hil com0 com1
+	R bpf0 bpf1 tun0 tun1 lkm random
 	;;
 
 std)
@@ -351,7 +353,7 @@ all)
 	R cd0 cd1 rd0 tun0 tun1 tun2 tun3 bpf0 bpf1 bpf2 bpf3 bpf4
 	R bpf5 bpf6 bpf7 bpf8 bpf9 pty0 pty1 pty2 fd1 fd1B fd1C fd1D
 	R fd1E fd1F fd1G fd1H fd0 fd0B fd0C fd0D fd0E fd0F fd0G fd0H
-	R xfs0 ss0 ss1 ch0 uk0 random lpa0 lpa1 lpa2 lpt0 lpt1 lpt2
+	R xfs0 ss0 ss1 ch0 uk0 rndrandom lpa0 lpa1 lpa2 lpt0 lpt1 lpt2
 	R lkm tty00 tty01 tty02 tty03 pf altq std st0 st1 fd
 	;;
 
diff --git a/src/etc/etc.i386/MAKEDEV b/src/etc/etc.i386/MAKEDEV
index 80410319..f881a68b 100644
--- a/src/etc/etc.i386/MAKEDEV
+++ b/src/etc/etc.i386/MAKEDEV
@@ -3,11 +3,11 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.i386/MAKEDEV.md,v 1.7 2002/02/21 13:34:14 todd Exp 
-#	OpenBSD: MAKEDEV.mi,v 1.38 2002/02/21 13:41:55 todd Exp 
+#	OpenBSD: etc.i386/MAKEDEV.md,v 1.5 2002/02/17 05:14:30 deraadt Exp 
+#	OpenBSD: MAKEDEV.mi,v 1.36 2002/02/19 21:05:10 todd Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.7 2002/02/16 01:19:52 deraadt Exp 
 #
-#	$OpenBSD: MAKEDEV,v 1.124 2002/02/21 13:44:12 todd Exp $
+#	$OpenBSD: MAKEDEV,v 1.125 2002/02/21 18:34:11 deraadt Exp $
 #
 # Copyright (c) 2001,2002 Todd T. Fries <todd@OpenBSD.org>
 # All rights reserved.
@@ -221,8 +221,8 @@ U=`unt $i`
 
 case $i in
 ramdisk)
-	R std bpf0 fd0 wd0 wd1 wd2 wd3 sd0 sd1 sd2 sd3 mcd0 random
-	R tty00 tty01 tty02 tty03 rd0 st0 st1 wt0 cd0 cd1 ttyC0
+	R std bpf0 fd0 wd0 wd1 sd0 sd1 tty00 tty01 rd0
+	R st0 cd0 ttyC0 random
 	;;
 
 std)
@@ -486,7 +486,7 @@ wscons)
 	;;
 
 rd*)
-	dodisk2 rd $U 17 47 $U 0
+	dodisk2 rd $U 17 17 $U 0
 	;;
 
 vnd*)
@@ -562,9 +562,9 @@ all)
 	R cd0 cd1 rd0 tun0 tun1 tun2 tun3 bpf0 bpf1 bpf2 bpf3 bpf4
 	R bpf5 bpf6 bpf7 bpf8 bpf9 pty0 pty1 pty2 fd1 fd1B fd1C fd1D
 	R fd1E fd1F fd1G fd1H fd0 fd0B fd0C fd0D fd0E fd0F fd0G fd0H
-	R xfs0 ss0 ss1 ch0 ses0 bktr0 wscons pci iop0 iop1 usbs rmidi0
+	R xfs0 ss0 ss1 ch0 ses0 wscons pci iop0 iop1 usbs rmidi0
 	R rmidi1 rmidi2 rmidi3 rmidi4 rmidi5 rmidi6 rmidi7 tuner0
-	R radio0 music0 speaker audio0 wdt0 wt0 uk1 uk0 random joy0
+	R radio0 music0 speaker audio0 wdt0 wt0 uk0 rndrandom 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 altq pctr wd0 wd1 wd2 wd3 raid0 raid1 raid2 raid3
diff --git a/src/etc/etc.mac68k/MAKEDEV b/src/etc/etc.mac68k/MAKEDEV
index f8d9b766..2015372c 100644
--- a/src/etc/etc.mac68k/MAKEDEV
+++ b/src/etc/etc.mac68k/MAKEDEV
@@ -4,10 +4,10 @@
 # generated from:
 #
 #	OpenBSD: etc.mac68k/MAKEDEV.md,v 1.4 2002/02/14 13:29:20 todd Exp 
-#	OpenBSD: MAKEDEV.mi,v 1.38 2002/02/21 13:41:55 todd Exp 
+#	OpenBSD: MAKEDEV.mi,v 1.36 2002/02/19 21:05:10 todd Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.7 2002/02/16 01:19:52 deraadt Exp 
 #
-#	$OpenBSD: MAKEDEV,v 1.51 2002/02/21 13:44:12 todd Exp $
+#	$OpenBSD: MAKEDEV,v 1.52 2002/02/21 18:34:11 deraadt Exp $
 #
 # Copyright (c) 2001,2002 Todd T. Fries <todd@OpenBSD.org>
 # All rights reserved.
@@ -337,7 +337,6 @@ st*)
 
 ramdisk)
 	R bpf0 std pty0 tty00 tty01 asc0 adb st0 st1 sd0 sd1 sd2 sd3
-	R cd0 cd1 ttye0
 	;;
 
 local)
@@ -353,8 +352,8 @@ fd)
 all)
 	R ccd0 ccd1 ccd2 ccd3 cd0 cd1 tun0 tun1 tun2 tun3 bpf0 bpf1
 	R bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0 pty1 pty2 xfs0
-	R ss0 ss1 ch0 vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4 grf0
-	R grf1 grf2 grf3 local adb asc0 uk1 uk0 random lkm ttye0 tty00
+	R ss0 ss1 ch0 vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4 local
+	R grf0 grf1 grf2 grf3 adb asc0 uk0 rndrandom lkm ttye0 tty00
 	R tty01 pf altq std st0 st1 fd
 	;;
 
diff --git a/src/etc/etc.macppc/MAKEDEV b/src/etc/etc.macppc/MAKEDEV
index 82cd7552..1a1c44a6 100644
--- a/src/etc/etc.macppc/MAKEDEV
+++ b/src/etc/etc.macppc/MAKEDEV
@@ -4,10 +4,10 @@
 # generated from:
 #
 #	OpenBSD: etc.macppc/MAKEDEV.md,v 1.4 2002/02/14 13:29:20 todd Exp 
-#	OpenBSD: MAKEDEV.mi,v 1.38 2002/02/21 13:41:55 todd Exp 
+#	OpenBSD: MAKEDEV.mi,v 1.36 2002/02/19 21:05:10 todd Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.7 2002/02/16 01:19:52 deraadt Exp 
 #
-#	$OpenBSD: MAKEDEV,v 1.21 2002/02/21 13:44:12 todd Exp $
+#	$OpenBSD: MAKEDEV,v 1.22 2002/02/21 18:34:11 deraadt Exp $
 #
 # Copyright (c) 2001,2002 Todd T. Fries <todd@OpenBSD.org>
 # All rights reserved.
@@ -423,8 +423,8 @@ st*)
 	;;
 
 ramdisk)
-	R bpf0 std random pty0 rd0 cd0 cd1 st0 st1 wd0 wd1 wd2 wd3
-	R wd4 sd0 sd1 sd2 sd3 sd4
+	R bpf0 std pty0 ttyE0 rd0 cd0 cd1 st0 st1 wd0 wd1 wd2 wd3 wd4
+	R sd0 sd1 sd2 sd3 sd4
 	;;
 
 local)
@@ -441,9 +441,9 @@ 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
 	R bpf5 bpf6 bpf7 bpf8 bpf9 pty0 pty1 pty2 xfs0 ss0 ss1 ch0
-	R local wscons pci iop0 iop1 usbs audio0 uk0 random lkm tty00
-	R tty01 tty02 tty03 apm crypto pf altq wd0 wd1 wd2 wd3 raid0
-	R raid1 raid2 raid3 std st0 st1 fd
+	R local wscons pci iop0 iop1 usbs audio0 uk0 rndrandom lkm
+	R tty00 tty01 tty02 tty03 apm crypto pf altq wd0 wd1 wd2 wd3
+	R raid0 raid1 raid2 raid3 std st0 st1 fd
 	;;
 
 wd*|sd*|raid*|ccd*)
diff --git a/src/etc/etc.sparc/MAKEDEV b/src/etc/etc.sparc/MAKEDEV
index eab1cf44..3fc4be72 100644
--- a/src/etc/etc.sparc/MAKEDEV
+++ b/src/etc/etc.sparc/MAKEDEV
@@ -4,10 +4,10 @@
 # generated from:
 #
 #	OpenBSD: etc.sparc/MAKEDEV.md,v 1.9 2002/02/17 05:14:30 deraadt Exp 
-#	OpenBSD: MAKEDEV.mi,v 1.38 2002/02/21 13:41:55 todd Exp 
+#	OpenBSD: MAKEDEV.mi,v 1.36 2002/02/19 21:05:10 todd Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.7 2002/02/16 01:19:52 deraadt Exp 
 #
-#	$OpenBSD: MAKEDEV,v 1.89 2002/02/21 13:44:12 todd Exp $
+#	$OpenBSD: MAKEDEV,v 1.90 2002/02/21 18:34:11 deraadt Exp $
 #
 # Copyright (c) 2001,2002 Todd T. Fries <todd@OpenBSD.org>
 # All rights reserved.
@@ -471,8 +471,8 @@ all)
 	R bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0 pty1 pty2 fd1
 	R fd1B fd1C fd1D fd1E fd1F fd1G fd1H fd0 fd0B fd0C fd0D fd0E
 	R fd0F fd0G fd0H xfs0 ss0 ss1 ch0 ses0 tcx0 cgfourteen0
-	R cgeight0 cgsix0 cgfour0 cgthree0 cgtwo0 bwtwo0 audio0 uk1
-	R uk0 random lkm cuaa cuab cuac cuad ttya ttyb ttyc ttyd pf
+	R cgeight0 cgsix0 cgfour0 cgthree0 cgtwo0 bwtwo0 audio0 uk0
+	R rndrandom lkm cuaa cuab cuac cuad ttya ttyb ttyc ttyd pf
 	R altq xd0 xd1 xd2 xd3 raid0 raid1 raid2 raid3 std st0 st1 fd
 	;;
 
diff --git a/src/etc/etc.sparc64/MAKEDEV b/src/etc/etc.sparc64/MAKEDEV
index 08dac005..6c0a7d02 100644
--- a/src/etc/etc.sparc64/MAKEDEV
+++ b/src/etc/etc.sparc64/MAKEDEV
@@ -4,10 +4,10 @@
 # generated from:
 #
 #	OpenBSD: etc.sparc64/MAKEDEV.md,v 1.17 2002/02/14 13:29:21 todd Exp 
-#	OpenBSD: MAKEDEV.mi,v 1.38 2002/02/21 13:41:55 todd Exp 
+#	OpenBSD: MAKEDEV.mi,v 1.36 2002/02/19 21:05:10 todd Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.7 2002/02/16 01:19:52 deraadt Exp 
 #
-#	$OpenBSD: MAKEDEV,v 1.60 2002/02/21 13:44:12 todd Exp $
+#	$OpenBSD: MAKEDEV,v 1.61 2002/02/21 18:34:11 deraadt Exp $
 #
 # Copyright (c) 2001,2002 Todd T. Fries <todd@OpenBSD.org>
 # All rights reserved.
@@ -549,7 +549,7 @@ all)
 	R bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0 pty1 pty2
 	R fd1 fd1B fd1C fd1D fd1E fd1F fd1G fd1H fd0 fd0B fd0C fd0D
 	R fd0E fd0F fd0G fd0H xfs0 ss0 ss1 ch0 ses0 ccd0 ccd1 ccd2
-	R ccd3 wscons pci usbs audio0 uk1 uk0 random lkm tty00 tty01
+	R ccd3 wscons pci usbs audio0 uk0 rndrandom lkm tty00 tty01
 	R tty02 tty03 ttyh0 ttyh1 crypto pf altq wd0 wd1 wd2 wd3 raid0
 	R raid1 raid2 raid3 std st0 st1 fd
 	;;
diff --git a/src/etc/etc.sun3/MAKEDEV b/src/etc/etc.sun3/MAKEDEV
index 82ee7113..2f61ed1c 100644
--- a/src/etc/etc.sun3/MAKEDEV
+++ b/src/etc/etc.sun3/MAKEDEV
@@ -3,11 +3,11 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.sun3/MAKEDEV.md,v 1.3 2002/02/21 13:09:03 todd Exp 
-#	OpenBSD: MAKEDEV.mi,v 1.38 2002/02/21 13:41:55 todd Exp 
+#	OpenBSD: etc.sun3/MAKEDEV.md,v 1.2 2002/02/14 13:29:21 todd Exp 
+#	OpenBSD: MAKEDEV.mi,v 1.36 2002/02/19 21:05:10 todd Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.7 2002/02/16 01:19:52 deraadt Exp 
 #
-#	$OpenBSD: MAKEDEV,v 1.55 2002/02/21 13:44:12 todd Exp $
+#	$OpenBSD: MAKEDEV,v 1.56 2002/02/21 18:34:11 deraadt Exp $
 #
 # Copyright (c) 2001,2002 Todd T. Fries <todd@OpenBSD.org>
 # All rights reserved.
@@ -184,9 +184,6 @@ U=`unt $i`
 [ "$U" ] || U=0
 
 case $i in
-ramdisk)
-	R std random bpf0 sd0 sd1 rd0
-	;;
 std)
 	M console	c 0 0 600
 	M tty		c 2 0
@@ -339,7 +336,7 @@ all)
 	R ccd0 ccd1 ccd2 ccd3 vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4
 	R cd0 cd1 rd0 xy0 xy1 xy2 xy3 tun0 tun1 tun2 tun3 bpf0 bpf1
 	R bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0 pty1 pty2 xfs0
-	R ss0 ss1 local cgfour0 cgtwo0 bwtwo0 uk1 uk0 random ttya ttyb
+	R ss0 ss1 local cgfour0 cgtwo0 bwtwo0 uk0 rndrandom ttya ttyb
 	R ttyc ttyd pf altq xd0 xd1 xd2 xd3 std st0 st1 fd
 	;;
 
diff --git a/src/etc/etc.vax/MAKEDEV b/src/etc/etc.vax/MAKEDEV
index 58480656..add73391 100644
--- a/src/etc/etc.vax/MAKEDEV
+++ b/src/etc/etc.vax/MAKEDEV
@@ -1,393 +1,451 @@
 #!/bin/sh -
 #
-# THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
-# generated from:
+#	$OpenBSD: MAKEDEV,v 1.44 2002/02/21 18:34:11 deraadt Exp $
+#	$NetBSD: MAKEDEV,v 1.30 2000/01/21 12:28:29 tsutsui Exp $
 #
-#	OpenBSD: etc.vax/MAKEDEV.md,v 1.8 2002/02/21 13:17:30 todd Exp 
-#	OpenBSD: MAKEDEV.mi,v 1.38 2002/02/21 13:41:55 todd Exp 
-#	OpenBSD: MAKEDEV.sub,v 1.7 2002/02/16 01:19:52 deraadt Exp 
+#	@(#)MAKEDEV	8.1 (Berkeley) 6/9/93
 #
-#	$OpenBSD: MAKEDEV,v 1.43 2002/02/21 13:44:13 todd Exp $
-#
-# Copyright (c) 2001,2002 Todd T. Fries <todd@OpenBSD.org>
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. The name of the author may not be used to endorse or promote products
-#    derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-# INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-# AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
-# THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-
-
 # Device "make" file.  Valid arguments:
-#	all	makes all known devices, including local devices.
-#		Tries to make the ``standard'' number of each type.
 #	std	standard devices
 #	local	configuration specific devices
+#	all	create a reasonable amount of all files
 # Tapes:
-#	st*	SCSI tapes
-#	mt*	(Magnetic) 9-track reel tape
 #	ht*	massbus tm03 & tu??
 #	tm*	unibus tm11 & te10 emulations (e.g. Emulex tc-11)
+#	mt*	MSCP tapes (e.g. TU81, TK50)
 #	ts*	unibus ts11
 #	ut*	unibus tu45 emulations (e.g.si 9700)
+#	uu*	tu58 cassettes on dl11 controller
+#	st*	SCSI tapes
 # Disks:
-#	hp*	massbuss rm??
+#	hp*	massbus rm??
 #	hk*	unibus rk06 and rk07
 #	up*	other unibus devices (e.g. on Emulex sc-21v controller)
 #	ra*	MSCP disks (ra??, hd??)
-#	rb*	730 idc w/ rb80 and/or rb02
 #	rx*	MSCP floppy disk (rx33/50/...)
-#	rl*	unibus r102
-#	hd*	HP300 HP-IB disks
-#	sd*	SCSI disks
-#	cd*	SCSI cdrom drives
-#	ch*	SCSI media changer
-#	ss*	SCSI scanners
-#	uk*	SCSI Unknown device
-#	rd*	"rd" pseudo-disks
-#	fd*	Floppy disk drives (3 1/2", 5 1/4")
+#	rl*	unibus rl02
+#	rb*	730 idc w/ rb80 and/or rb02
+#	ccd*	"concatenated" pseudo-disks
+#	raid*	RAIDframe disk driver
 #	vnd*	"file" pseudo-disks
-#	ccd*	concatenated disk devices
-# Pseudo terminals:
-#	tty*	set of 16 slave psuedo terminals
-#	pty*	set of 16 master pseudo terminals
-# Printers:
-# Terminal ports:
-#	dhu*	unibus dhu11
+#	rd*	memory pseudo-disk devices
+#	sd*	SCSI disks
+#	cd*	SCSI CD-ROM
+#	hd*	HDC9224 hd disks on VS2000
+# Terminal multiplexors:
+#	dz*	unibus dz11 and dz32
 #	dh*	unibus dh11 and emulations (e.g. Able dmax, Emulex cs-11)
 #	dmf*	unibus dmf32
-#	dmz*	unibus dmz32
-#	vt*	console
-#	dz*	unibus dz11 and dz32
+#	dhu*    unibus dhu11
+#	dmz*    unibus dmz32
 #	dl*	unibus dl11
+# Pseudo terminals:
+#	pty*	set of 16 master and slave pseudo terminals
+# Printers:
+#	ct*	unibus parallel interface to CAT typesetter
+#	lp*	unibus lp11 parallel interface
+#	va*	unibus varian parallel interface
+#	vp*	unibus versatec parallel interface
+# Call units:
+#	dn*	unibus dn11 and emulations (e.g. Able Quadracall)
 # Special purpose devices:
-#	openprom	
-#	bpf*	Berkeley Packet Filter
-#	pf*	Packet Filter
-#	altq/	ALTQ control interface
-#	lkm	loadable kernel modules interface
-#	tun*	network tunnel driver
-#	*random	inkernel random data source
-#	magma*	magma card (makes 16 tty and 2 bpp)
-#	xfs*	XFS filesystem devices
-#	raid*	RAIDframe disk devices
-#	fd	makes fd/* for the fdescfs
-#	ses*	SES/SAF-TE SCSI devices
+#	ik*	unibus interface to ikonas frame buffer
+#	ps*	unibus interface to e&s picture system 2
+#	ad*	unibus interface to data translation a/d converter
+#	np*	unibus ethernet co-processor interface, for downloading.
+#	qv*	qvss (microvax) display
+#	ttyv0	qvss (microvax) display reserved pty
+#	lkm	loadable kernel modules
+#	bpf*	berkeley packet filter
+#	tun*	network tunnel device
+#	ss*	SCSI scanner
+#	uk*	SCSI unknown
+#	ch*	SCSI changer
+#	*random	Random number generator
+#	altq	ALTQ control interface
+#
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
-T=$0
-
-# set this to echo for Echo-Only debugging
-[ "$eo" ] || eo=
-
-hex()
-{
-	case $1 in
-	[0-9]) echo -n $1;;
-	10) echo -n a;;
-	11) echo -n b;;
-	12) echo -n c;;
-	13) echo -n d;;
-	14) echo -n e;;
-	15) echo -n f;;
-	esac
-}
-
-trunc()
-{
-	# XXX pdksh can't seem to deal with locally scoped variables
-	# in ${foo#$bar} expansions
-	arg1="$1"
-	arg2="$2"
-	case $3 in
-	l)   echo ${arg2#$arg1} ;;
-	r|*) echo ${arg1#$arg2} ;;
-	esac
-}
-
-unt()
-{
-	# XXX pdksh can't seem to deal with locally scoped variables
-	# in ${foo#$bar} expansions
-	arg="$1"
-	tmp="${arg#[a-zA-Z]*}"
-	tmp="${tmp%*[a-zA-Z]}"
-	while [ "$tmp" != "$arg" ]
-	do
-		arg=$tmp
-		tmp="${arg#[a-zA-Z]*}"
-		tmp="${tmp%*[a-zA-Z]}"
-	done
-	echo $arg
-}
-
-dodisk()
-{
-	[ "$DEBUG" ] && set -x
-	n=$(($((${5}*${7:-16}))+${6})) count=0
-	RMlist="$RMlist $1$2? r$1$2?"
-	[ 0$7 -ne 8 ] && l="i j k l m n o p"
-	for d in a b c d e f g h $l
-	do
-		M $1$2$d	b $3 $(($n+$count)) 640
-		M r$1$2$d	c $4 $(($n+$count)) 640
-		let count=count+1
-	done
-	MKlist="$MKlist;chown root.operator $1$2? r$1$2?"
-}
-
-dodisk2()
-{
-	n=$(($(($5*${7:-16}))+$6))
-	M $1$2a b $3 $n 640 operator
-	M r$1$2a c $4 $n 640 operator
-	n=$(($n+2))
-	M $1$2c b $3 $n 640 operator
-	M r$1$2c c $4 $n 640 operator
-}
-
-# M name b/c major minor [mode] [group]
-RMlist="rm -f"
-MKlist=":"
-
-mkl() {
-	[ "${mklist[$1]}" ] && {
-		mklist[$1]="${mklist[$1]};mknod -m $1 $2 $3 $4 $5"
-	} || {
-		mklist[$1]="mknod -m $1 $2 $3 $4 $5"
-		modes="$modes $1"
-	}
-}
-
-M() {
-	RMlist="$RMlist $1"
-	mkl ${5-666} $1 $2 $3 $4
-	mklist="$mklist $1"
-	G=${6:-wheel}
-	[ "$7" ] && {
-		MKlist="$MKlist;chown $7.$G $1"
-	} || {
-		case $G in
-		wheel)g=0;;kmem)g=2;;operator)g=5;;tty)g=4;;dialer)g=117;;
-		esac
-		[ "${grplist[$g]}" ] && {
-			grplist[$g]="${grplist[$g]} $1"
-		} || {
-			groups="$groups $g"
-			grplist[$g]="chgrp $G $1"
-		}
-	}
-	return 0
-}
-
-R() {
-[ "$DEBUG" ] && set -x
-for i in "$@"
+set -A cnvtbl 0 1 2 3 4 5 6 7 8 9 a b c d e f g h i j k l m n o p q r s t u v
+umask 77
+for i
 do
-U=`unt $i`
-[ "$U" ] || U=0
-
 case $i in
+
+all)
+	sh $0 std fd vnd0 ccd0 pty0 pty1 lkm random altq
+	sh $0 bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 pf tun0 tun1
+	sh $0 mt0 mt1 ts0 ts1 st0 st1 uk0 ss0 cd0 vt0
+	sh $0 ra0 ra1 ra2 ra3 hp0 hp1 hp2 hp3 sd0 sd1 sd2 sd3 hd0 hd1 hd2
+	sh $0 dz0 dl0 dhu0 rx0 rx1 raid0 raid1 raid2 raid3
+	;;
+
+floppy)
+	sh $0 std random
+	sh $0 sd0 sd1
+	;;
+
 ramdisk)
-	R std random st0 st1 rx0 bpf0 rd0
-	R sd0 sd1 sd2 sd3 cd0 ra0 ra1 ra2
+	sh $0 std random
+	sh $0 rd0 sd0 sd1 sd2 sd3 ra0 ra1 ra2 rx0 cd0 st0 st1
+	sh $0 bpf0
 	;;
 
 std)
-	M console	c 0 0 600
-	M tty		c 2 0
-	M mem		c 3 0 640 kmem
-	M kmem		c 3 1 640 kmem
-	M null		c 3 2
-	M zero		c 3 12
-	M stdin		c 53 0
-	M stdout	c 53 1
-	M stderr	c 53 2
-	M ksyms		c 50 0 640 kmem
-	M drum		c 7 0 640 kmem
-	M klog		c 33 0 600
-	M ttyg0		c 25 0 600
-	M ttyg1		c 25 1 600
-	M ttyg2		c 25 2 600
-	M ttyg3		c 25 3 600
-	M crl		c 35 0 600
-	M csa1		c 51 0 600
-	M csa2		c 51 1 600
-	M tu0		b 8 0 600
-	M tu1		b 8 1 600
-	M floppy	c 8 0 600
-	M kUmem		c 3 3 600
+	rm -f console drum floppy crl csa1 csa2 tu0 tu1
+	rm -f kUmem kmem mem null zero tty klog ttyg[0-3]
+	rm -f stdin stdout stderr ksyms
+	mknod console		c 0 0
+	mknod ttyg0		c 25 0
+	mknod ttyg1		c 25 1
+	mknod ttyg2		c 25 2
+	mknod ttyg3		c 25 3
+	mknod drum		c 7 0	; chmod 640 drum ; chgrp kmem drum
+	mknod floppy		c 8 0
+	mknod crl		c 35 0
+	mknod csa1		c 51 0
+	mknod csa2		c 51 1
+	mknod tu0		b 8 0
+	mknod tu1		b 8 1
+	mknod kUmem		c 3 3	; chmod 600 kUmem
+	mknod kmem		c 3 1	; chmod 640 kmem ; chgrp kmem kmem
+	mknod mem		c 3 0	; chmod 640 mem ; chgrp kmem mem
+	mknod null		c 3 2	; chmod 666 null
+	mknod zero		c 3 12  ; chmod 666 zero
+	mknod tty		c 2 0	; chmod 666 tty
+	mknod klog		c 33 0	; chmod 600 klog
+	mknod stdin		c 53 0	; chmod 666 stdin
+	mknod stdout		c 53 1	; chmod 666 stdout
+	mknod stderr		c 53 2	; chmod 666 stderr
+	mknod ksyms		c 50 0	; chmod 640 ksyms ; chown root.kmem ksyms
+	;;
+
+fd)
+	rm -f fd/*
+	mkdir fd > /dev/null 2>&1
+	n=0
+	while [ $n -lt 64 ]; do
+		mknod fd/$n c 53 $n
+		n=$(($n + 1))
+	done
+	chown -R root.wheel fd
+	chmod 755 fd
+	chmod 666 fd/*
 	;;
 
 ht*|tm*|mt*|ts*|ut*)
 	case $i in
-	ht*) n=ht b=1 c=5;;
-	mt*) n=mt b=15 c=38;;
-	tm*) n=tm b=5 c=14;;
-	ts*) n=ts b=6 c=16;;
-	ut*) n=ut b=10 c=17;;
+	ht*) name=ht;	unit=${i#ht};	blk=1; chr=5 ;;
+	mt*) name=mt;	unit=${i#mt};	blk=15;	chr=38;;
+	tm*) name=tm;	unit=${i#tm};	blk=5; chr=14;;
+	ts*) name=ts;	unit=${i#ts};	blk=6; chr=16;;
+	ut*) name=ut;	unit=${i#ut};	blk=10; chr=17;;
 	esac
-	case $U in
+	case $unit in
 	[0-7])
-		four=$(($U+4))
-		eight=$(($U+8))
-		twelve=$(($U+12))
-		twenty=$(($U+20))
-		M $n$U		b $b $U	660 operator
-		M $n$four	b $b $four	660 operator
-		M $n$eight	b $b $eight	660 operator
-		M $n$twelve	b $b $twelve	660 operator
-		M n$n$U		b $b $four	660 operator;: sanity w/pdp11 v7
-		M n$n$eight	b $b $twelve	660 operator;: ditto
-		M nr$n$U	c $c $four	660 operator;: ditto
-		M nr$n$eight	c $c $twelve	660 operator;: ditto
-		M r$n$U		c $c $U		660 operator
-		M r$n$four	c $c $four	660 operator
-		M r$n$eight	c $c $eight	660 operator
-		M r$n$twelve	c $c $twelve	660 operator
-		if [ "$i" = "ut" ];
+		four=$(($unit + 4)) ; eight=$(($unit + 8))
+		twelve=$(($unit + 12)) ; twenty=$(($unit + 20))
+		rm -f $name$unit $name$four $name$eight $name$twelve \
+		    n$name$unit n$name$eight nr$name$unit nr$name$eight \
+		    r$name$unit r$name$four r$name$eight r$name$twelve
+		mknod $name$unit	b $blk $unit
+		mknod $name$four	b $blk $four
+		mknod $name$eight	b $blk $eight
+		mknod $name$twelve	b $blk $twelve
+		mknod n$name$unit	b $blk $four ;: sanity w/pdp11 v7
+		mknod n$name$eight	b $blk $twelve ;: ditto
+		mknod nr$name$unit	c $chr $four ;: sanity w/pdp11 v7
+		mknod nr$name$eight	c $chr $twelve ;: ditto
+		mknod r$name$unit	c $chr $unit
+		mknod r$name$four	c $chr $four
+		mknod r$name$eight	c $chr $eight
+		mknod r$name$twelve	c $chr $twelve
+		chown root.operator {,n,r,nr}$name{$unit,$eight}
+		chown root.operator {,r}$name{$four,$twelve}
+		chmod 660 {,n,r,nr}$name{$unit,$eight}
+		chmod 660 {,r}$name{$four,$twelve}
+		if [ $i = ut ] 
 		then
-			M $n$twenty	b $b $twenty 660 operator
-			M r$n$twenty	c $b $twenty 660 operator
+			rm -f $name$twenty r$name$twenty
+			mknod $name$twenty	b $blk $twenty
+			mknod r$name$twenty	c $chr $twenty
+			chown root.operator {,r}$name$twenty
+			chmod 660 {,r}$name$twenty
+		fi
+		if [ ! -e rmt$eight ]	# compatibility stuff
+		then
+			rm -f mt$unit mt$four mt$eight mt$twelve \
+			    nmt$unit nmt$eight nrmt$unit nrmt$eight \
+			    rmt$unit rmt$four rmt$eight rmt$twelve
+			ln -s $name$unit mt$unit
+			ln -s $name$four mt$four
+			ln -s $name$eight mt$eight
+			ln -s $name$twelve mt$twelve
+			ln -s n$name$unit nmt$unit
+			ln -s n$name$eight nmt$eight
+			ln -s nr$name$unit nrmt$unit
+			ln -s nr$name$eight nrmt$eight
+			ln -s r$name$unit rmt$unit
+			ln -s r$name$four rmt$four
+			ln -s r$name$eight rmt$eight
+			ln -s r$name$twelve rmt$twelve
 		fi
 		;;
 	*)
-		echo bad unit for tape in: $i
+		echo bad unit for tape in: $1
 		;;
 	esac
 	umask 77
 	;;
 
-ses*)
-	M ses$U c 124 $U 640 operator
-	;;
-
-fd)
-	RMlist="mkdir -p fd;$RMlist" n=0
-	while [ $n -lt 64 ];do M fd/$n c 53 $n;n=$(($n+1));done
-	MKlist="$MKlist;chmod 555 fd"
+st*)
+	umask 2
+	unit=${i#st};	blk=21; chr=60;
+	case $unit in
+	0|1|2|3|4|5|6|7)
+		rm -f {e,}{n,}{r,}st${unit}
+		mknod st${unit}		b $blk $(($unit * 16 + 0))
+		mknod nst${unit}	b $blk $(($unit * 16 + 1))
+		mknod est${unit}	b $blk $(($unit * 16 + 2))
+		mknod enst${unit}	b $blk $(($unit * 16 + 3))
+		mknod rst${unit}	c $chr $(($unit * 16 + 0))
+		mknod nrst${unit}	c $chr $(($unit * 16 + 1))
+		mknod erst${unit}	c $chr $(($unit * 16 + 2))
+		mknod enrst${unit}	c $chr $(($unit * 16 + 3))
+		chown root.operator {e,}{n,}{r,}st${unit}
+		chmod 660 {e,}{n,}{r,}st${unit}
+		;;
+	*)
+		echo bad tape unit: $i - $unit
+		;;
+	esac
+	umask 77
 	;;
 
-xfs*)
-	M xfs$U c 51 $U 600
+mt*)
+	umask 0 ; unit=`expr $i : '..\(.*\)'`
+	case $i in
+	mt*) blk=7; chr=19;;
+	esac
+	case $unit in
+	0|1|2|3|4|5|6|7)
+		eight=`expr $unit + 0`;
+		twelve=`expr $unit + 4`; 
+		sixteen=`expr $unit + 8`;
+		twenty=`expr $unit + 12`;
+		rm -f mt8 mt12 mt16 mt20 nmt8 nrmt8 rmt8 rmt12 rmt16 rmt20
+		rm -f nmt16 nrmt16
+		mknod mt8		b $blk $eight
+		mknod mt12		b $blk $twelve
+		mknod mt16		b $blk $sixteen
+		mknod mt20		b $blk $twenty
+		mknod nmt8		b $blk $twelve ;: ditto
+		mknod nrmt8		c $chr $twelve ;: ditto
+		mknod rmt8		c $chr $eight
+		mknod rmt12		c $chr $twelve
+		mknod rmt16		c $chr $sixteen
+		mknod rmt20		c $chr $twenty
+		mknod nmt16		b $blk $twenty ;: ditto
+		mknod nrmt16		c $chr $twenty ;: ditto
+		chown root.operator {,n,r,nr}mt{8,16}
+		chown root.operator {,r}mt{12,20}
+		chmod 660 {,n,r,nr}mt{8,16}
+		chmod 660 {,r}mt{12,20}
+		;;
+	*)
+		echo bad unit for tape in: $1
+		;;
+	esac
+	umask 77
 	;;
 
-magma*)
-	case $U in
-	0)	offset=0  nam=m;;
-	1)	offset=16 nam=n;;
-	2)	offset=32 nam=o;;
-	*)	echo "bad unit for $i: $U"; exit 127;;
-	esac
-	offset=$(($U*64))
-	n=0
-	while [ $n -lt 16 ]
-	do
-		name=${nam}`hex $n`
-		M tty$name c major_mag_c $(($offset+$n)) 660 dialer uucp
-		n=$(($n+1))
-	done
-	M bpp${nam}0 c major_bppmag_c $(($offset+0)) 600
-	M bpp${nam}1 c major_bppmag_c $(($offset+1)) 600
+random|srandom|urandom|prandom|arandom)
+	rm -f random urandom srandom prandom arandom
+	mknod  random c 67 0
+	mknod srandom c 67 1
+	mknod urandom c 67 2
+	mknod prandom c 67 3
+	mknod arandom c 67 4
+	chown root.wheel random srandom urandom prandom arandom
+	chmod 644 random srandom urandom prandom arandom
 	;;
 
-*random)
-	n=0
-	for pre in " " s u p a
-	do
-		M ${pre}random c 67 $n 644
-		n=$(($n+1))
+vnd*)
+	umask 2
+	unit=${i#vnd}
+	if [ -z "$unit" -o 0$unit -gt 7 ]
+	then
+		echo bad disk unit: $i - $unit
+		exit 127
+	fi
+	blk=18; chr=55;
+	for name in vnd svnd; do
+		case $name in
+		vnd) off=0;;
+		svnd) off=128;;
+		esac
+		rm -f {r,}${name}${unit}[a-p]
+		minor=$(($unit * 16 + $off))
+		for slice in a b c d e f g h i j k l m n o p
+		do
+			mknod ${name}${unit}${slice}  b $blk $minor
+			mknod r${name}${unit}${slice} c $chr $minor
+			minor=$(($minor + 1))
+		done
+		chown root.operator {r,}${name}${unit}?
+		chmod 640 {r,}${name}${unit}?
 	done
+	umask 77
 	;;
 
-tun*)
-	M tun$U c 57 $U 600
+hp*|hk*|up*|ra*|rl*|rb*|ccd*|hd*|sd*|rx*|raid*)
+	umask 2
+	case $i in
+	hp*) name=hp;	unit=${i#hp};	blk=0; chr=4;;
+	hk*) name=hk;	unit=${i#hk};	blk=3; chr=11;;
+	up*) name=up;	unit=${i#up};	blk=2; chr=13;;
+	raid*) name=raid; unit=${i#raid}; blk=25; chr=73;;
+	ra*) name=ra;	unit=${i#ra};	blk=9;	chr=9;;
+	rb*) name=rb;	unit=${i#rb};	blk=11; chr=23;;
+	rx*) name=rx;	unit=${i#rx};	blk=12; chr=30;;
+	rl*) name=rl;	unit=${i#rl};	blk=14; chr=32;;
+	ccd*) name=ccd;	unit=${i#ccd};	blk=17; chr=54;;
+	hd*) name=hd;	unit=${i#hd};	blk=19; chr=58;;
+	sd*) name=sd;	unit=${i#sd};	blk=20; chr=59;;
+	esac
+	case $unit in
+	[0-9]|[12][0-9]|3[01])
+		minor=$(($unit * 16))
+		rm -f {r,}${name}${unit}[a-p]
+		for slice in a b c d e f g h i j k l m n o p
+		do
+			mknod ${name}${unit}${slice}  b $blk $minor
+			mknod r${name}${unit}${slice} c $chr $minor
+			minor=$(($minor + 1))
+		done
+		chgrp operator ${name}${unit}[a-p] r${name}${unit}[a-p]
+		chmod 640 ${name}${unit}[a-p] r${name}${unit}[a-p]
+		;;
+	*)
+		echo bad unit for disk in: $i
+		;;
+	esac
+	umask 77
 	;;
 
-lkm)
-	M lkm c 28 0 640 kmem
+cd*)
+	case $i in
+	cd*) name=cd;   unit=${i#cd};   chr=61; blk=22;;
+	esac
+	rm -f {r,}${name}${unit}{a,c}
+	mknod ${name}${unit}a   b $blk $(($unit * 16 + 0))
+	mknod ${name}${unit}c   b $blk $(($unit * 16 + 2))
+	mknod r${name}${unit}a  c $chr $(($unit * 16 + 0))
+	mknod r${name}${unit}c  c $chr $(($unit * 16 + 2))
+	chgrp operator {r,}${name}${unit}?
+	chmod 640 {r,}${name}${unit}?
 	;;
 
-altq)
-	RMlist="mkdir -p altq;$RMlist"
-	for d in altq cbq wfq afm fifoq red rio localq hfsc cdnr blue priq; do
-		M altq/$d c 75 $U 644
-		U=$(($U+1))
-	done
+ss*)
+	case $i in
+	ss*) name=ss;   unit=${i#ss};   chr=64;;
+	esac
+	rm -f {,n,en}${name}${unit}
+	mknod $name$unit	c $chr $(($unit * 16 + 0))
+	mknod n$name$unit	c $chr $(($unit * 16 + 1))
+	mknod en$name$unit	c $chr $(($unit * 16 + 3))
+	chgrp operator {,n,en}${name}${unit}
+	chmod 640 {,n,en}${name}${unit}
 	;;
 
-pf*)
-	M pf c 42 0 600
+ch*|uk*)
+	case $i in
+	ch*) name=ch;   unit=${i#ch};   chr=63;;
+	uk*) name=uk;   unit=${i#uk};   chr=65;;
+	esac
+	rm -f $name$unit
+	mknod $name$unit        c $chr $unit
+	chgrp operator $name$unit
+	chmod 640 $name$unit
 	;;
 
-bpf*)
-	M bpf$U c 56 $U 600
+rd*)
+	unit=${i#rd}; blk=23; chr=62;
+	rm -f rd${unit}{a,c} #rrd${unit}{a,c}
+	mknod rd${unit}a  b $blk $(($unit * 16 + 0)) 
+	mknod rd${unit}c  b $blk $(($unit * 16 + 2)) 
+#	mknod rrd${unit}a c $chr $(($unit * 16 + 0)) 
+#	mknod rrd${unit}c c $chr $(($unit * 16 + 2)) 
+	chgrp operator rd${unit}? #rrd${unit}?
+	chmod 640 rd${unit}? #rrd${unit}?
 	;;
 
-openprom)
-	M openprom c 70 0  
+uu*)
+	unit=${i#uu}
+	name=uu; blk=13;
+	case $unit in
+	[0-3])
+		rm -f ${name}${unit}{,a}
+		mknod ${name}${unit}	b $blk $(($unit * 2 + 0))
+		mknod ${name}${unit}a	b $blk $(($unit * 2 + 1))
+		;;
+	*)
+		echo bad unit for uu cassette in: $i
+		;;
+	esac
 	;;
 
 dz*)
-	case $U in
-       [0-7])
-	       i=0
-	       while [ $i -lt 8 ]; do
-		       no=$(($(($U*8))+$i))
-		       if [ $no -lt 10 ]; then
-			       no="0${no}"
-		       fi
-		       M tty${no} c 1 $no 600
-		       let i=i+1
-	       done
-	       ;;
+	unit=${i#dz};
+	case $unit in
+	[0-7])
+		i=0
+		while [ $i -lt 8 ]; do
+			no=$(($unit * 8 + $i))
+			if [ $no -lt 10 ]; then
+				no="0${no}"
+			fi
+			rm -f tty${no}
+			mknod tty${no} c 1 $no
+			i=$(($i + 1))
+		done
+		;;
 	*)
-	       echo bad unit for dz in: $i
-	       ;;
-       esac
+		echo bad unit for dz in: $i
+		;;
+	esac
 	;;
 
-dhu*|dmz*|dmf*|dh*|vt*)
-	set -A cnvtbl 0 1 2 3 4 5 6 7 8 9 a b c d e f g h i j k l m n o p q r s t u v
+dhu*|dh*|dmf*|dmz*|vt*)
 	case $i in
-	vt*)    name=vt; major=68; count=8;
-		case $U in
+	vt*)	name=vt; major=68; count=8;
+		unit=${i#vt}
+		case $unit in
 		0) ch=w ;;
 		*) echo bad unit for $name in: $i ;;
 		esac;;
-	dmz*)   name=dmz; major=37; count=24;
-		case $U in
+	dmz*)	name=dmz; major=37; count=24;
+		unit=${i#dmz}
+		case $unit in
 		0) ch=a ;; 1) ch=b ;; 2) ch=c ;; 3) ch=e ;; 4) ch=f ;;
 		*) echo bad unit for $name in: $i ;;
 		esac;;
-	dmf*)   name=dmf; major=22; count=8;
-		case $U in
+	dmf*)	name=dmf; major=22; count=8;
+		unit=${i#dmf}
+		case $unit in
 		0) ch=A ;; 1) ch=B ;; 2) ch=C ;; 3) ch=E ;;
 		4) ch=F ;; 5) ch=G ;; 6) ch=H ;; 7) ch=I ;;
 		*) echo bad unit for $name in: $i ;;
 		esac;;
-	dhu*)   name=dhu; major=34; count=16;
-		case $U in
+	dhu*)	name=dhu; major=34; count=16;
+		unit=${i#dhu}
+		case $unit in
 		0) ch=S ;; 1) ch=T ;; 2) ch=U ;; 3) ch=V ;;
 		4) ch=W ;; 5) ch=X ;; 6) ch=Y ;; 7) ch=Z ;;
 		*) echo bad unit for $name in: $i ;;
 		esac;;
-	dh*)    name=dh; major=12; count=16;
-		case $U in
+	dh*)	name=dh; major=12; count=16;
+		unit=${i#dh}
+		case $unit in
 		0) ch=h ;; 1) ch=i ;; 2) ch=j ;; 3) ch=k ;;
 		4) ch=l ;; 5) ch=m ;; 6) ch=n ;; 7) ch=o ;;
 		*) echo bad unit for $name in: $i ;;
@@ -397,170 +455,205 @@ dhu*|dmz*|dmf*|dh*|vt*)
 	while [ $i -lt $count ]; do
 		let=${cnvtbl[$i]}
 		if [ -n "$let" ] ;then
-			M tty${ch}${let} c $major $(($(($U*$count))+$i)) 600
+			rm -f tty${ch}${let}
+			mknod tty${ch}${let} c $major $(($unit * $count + $i))
 		else
-			echo bad count for ${name}: $U, $count, $i
+			echo bad count for ${name}: $unit, $count, $i
 		fi
-		let i=i+1
+		i=$(($i + 1))
 	done
+
 	;;
 
 dl*)
+	unit=${i#dl}
 	major=66
-	let=${cnvtbl[$U]}
+	let=${cnvtbl[$unit]}
 	if [ -n "$let" ] ;then
-		M ttyJ${let} c $major $U 600
+		rm -f ttyJ${let}
+		mknod ttyJ${let} c $major $unit
 	else
-		echo bad number for ${name}: $U
+		echo bad number for ${name}: $unit
 	fi
 	;;
 
+lp*|va*|vp*)
+	case $i in
+	lp*) name=lp; unit=${i#lp}; major=15;;
+	va*) name=va; unit=${i#va}; major=10;;
+	vp*) name=vp; unit=${i#vp}; major=6;;
+	esac
+	case $unit in
+	[0-7])
+		rm -f $i
+		mknod $i c $major $unit;
+		chmod 666 $i
+		;;
+	*)
+		echo bad unit for $name in: $i
+		;;
+	esac
+	;;
+
 pty*)
-	if [ $U -gt 15 ]; then
-		echo bad unit for pty in: $i
-		continue
-	fi
-	set -A tbl p q r s t u v w x y z P Q R S T
-	name=${tbl[$U]}
-	n=0
-	while [ $n -lt 16 ]
+	class=${i#pty};
+	case $class in
+	0)	name=p;;
+	1)	name=q;;
+	2)	name=r;;
+	3)	name=s;;
+	4)	name=t;;
+	5)	name=u;;
+	6)	name=v
+		echo "$0: $i: pty unit conflicts with another use."
+		continue;;
+	7)	name=w;;
+	8)	name=x;;
+	9)	name=y;;
+	10)	name=z;;
+	11)	name=P;;
+	12)	name=Q;;
+	13)	name=R;;
+	14)	name=S;;
+	15)	name=T;;
+	*)	echo "$0: $i: pty unit must be between 0 and 15"
+	        continue ;;
+	esac
+	rm -f tty$name[0-9a-f] pty$name[0-9a-f]
+	for j in 0 1 2 3 4 5 6 7 8 9 a b c d e f
 	do
-		nam=$name$(hex $n)
-		off=$(($U*16))
-		M tty$nam c 20 $(($off+$n))
-		M pty$nam c 21 $(($off+$n))
-		n=$(($n+1))
+		case $j in
+		[0-9])	jn=$j ;;
+		a)	jn=10 ;;
+		b)	jn=11 ;;
+		c)	jn=12 ;;
+		d)	jn=13 ;;
+		e)	jn=14 ;;
+		f)	jn=15 ;;
+		esac
+		unit=$(($class * 16 + $jn))
+		mknod tty$name$j c 20 $unit
+		mknod pty$name$j c 21 $unit
 	done
+	chgrp wheel tty$name? pty$name?
+	chmod 666 tty$name? pty$name?
 	;;
 
-vnd*)
-	dodisk vnd $U 18 55 $U 0
-	dodisk svnd $U 18 55 $U 128
-	;;
-
-fd*)
-	typnam=$U${i#fd[01]*}
-	case $typnam in
-	0|1)	typnum=0;; # no type specified, assume A
-	*A)	typnum=0; typnam=0;;
-	*B)	typnum=1;;
-	*C)	typnum=2;;
-	*D)	typnum=3;;
-	*E)	typnum=4;;
-	*F)	typnum=5;;
-	*G)	typnum=6;;
-	*H)	typnum=7;;
-	*)	echo bad type $typnam for $i; exit 1;;
+np*)
+	class=${i#np}
+	case $class in
+	0)	offset=0  name=0;;
+	1)	offset=16 name=1;;
+	2)	offset=32 name=2;;
+	*)	echo bad unit for np in: $i;;
 	esac
-	case $U in
-	0|1)	blk=16; chr=54;;
-	*)	echo bad unit $U for $i; exit 1;;
+	case $class in
+	0|1|2)
+	i=0
+	while [ $i -lt 4 ]; do
+		no=$(($offset + $i))
+		if [ $no -lt 10 ]; then
+			no="0${no}"
+		fi
+		rm -f np${no}
+		mknod np${no} c 39 $no
+		i=$(($i + 1))
+	done
 	esac
-	nam=fd${typnam}
-	n=$(($(($U*128))+$(($typnum*16))))
-	M ${nam}a	b $blk $n 640 operator
-	M ${nam}b	b $blk $(($n+1)) 640 operator
-	M ${nam}c	b $blk $(($n+2)) 640 operator
-	M r${nam}a	c $chr $n 640 operator
-	M r${nam}b	c $chr $(($n+1)) 640 operator
-	M r${nam}c	c $chr $(($n+2)) 640 operator
 	;;
 
-rd*)
-	dodisk2 rd $U 23 62 $U 0
+dn*|ik*|ps*|ad*|ct*)
+	case $i in
+	ct*) name=ct; unit=${i#ct}; chr=18;;
+	dn*) name=cu; unit=${i#dn}; chr=24;;
+	ps*) name=ps; unit=${i#ps}; chr=27;;
+	ad*) name=ad; unit=${i#ad}; chr=29;;
+	ik*) name=ik; unit=${i#ik}; chr=31;;
+	esac
+	case $unit in
+	[0-7])
+		umask 0
+		rm -f ${name}${unit}
+		mknod ${name}${unit} c ${chr} ${unit}
+		umask 77
+		;;
+	*)
+		echo bad unit for ${name} in: $i
+		;;
+	esac
 	;;
 
-uk*)
-	M uk$U c 65 $U 640 operator
+bpf*)
+	unit=${i#bpf};
+	rm -f bpf$unit
+	mknod bpf$unit c 56 $unit
+	chmod 600 bpf$unit
+	chown root.wheel bpf$unit
 	;;
 
-ss*)
-	M ss$U c 64 $(($U*16)) 640 operator
-	M nss$U c 64 $(($(($U*16))+1)) 640 operator
-	M enss$U c 64 $(($(($U*16))+3)) 640 operator
-	RMlist="$RMlist scan$U"
-	MKlist="$MKlist;umask 77;ln -s ss$U scan$U"
+qd*)
+	unit=${i#qd}
+	rm -f q{c,d}$unit
+	mknod qc$unit c 40 $(($unit * 4))
+	mknod qd$unit c 40 $(($unit * 4 + 2))
 	;;
 
-ch*)
-	M ch$U c 63 $U 660 operator
+pf)
+	rm -f pf
+	mknod pf c 42 0
+	chown root.wheel pf
+	chmod 600 pf
 	;;
 
-cd*)
-	dodisk2 cd $U 22 61 $U 0
+tun*)
+	unit=${i#tun}
+	rm -f tun$unit
+	mknod tun$unit c 57 $unit
+	chmod 600 tun$unit
+	chown root.wheel tun$unit
 	;;
 
-st*)
-	n=$(($U*16))
-	for pre in " " n e en
-	do
-		M ${pre}st$U	b 21 $n 660 operator
-		M ${pre}rst$U	c 60 $n 660 operator
-		n=$(($n+1))
-	done
+lkm)
+	rm -f lkm
+	mknod lkm c 28 0
+	chown root.kmem lkm
+	chmod 640 lkm
 	;;
 
-local)
-	test -s $T.local && sh $T.local
+qv0)
+	rm -f qv0 qvcons mouse
+	mknod qv0 c 40 0
+	mknod qvcons c 40 1
+	mknod mouse c 40 2
 	;;
 
-all)
-	R vt0 dl0 dz0 dhu0 ts0 ts1 mt0 mt1 hd0 hd1 hd2 ccd0 vnd0 sd0
-	R sd1 sd2 sd3 cd0 tun0 tun1 bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6
-	R bpf7 pty0 pty1 ss0 uk0 random lkm pf altq rx0 rx1 ra0 ra1
-	R ra2 ra3 hp0 hp1 hp2 hp3 raid0 raid1 raid2 raid3 std st0 st1
-	R fd
+ttyv0)
+	if [ ! -f ttyqe ]; then sh ./$0 pty1; fi
+	mv ttyqf ttyv0
+	mv ptyqf ptyv0
 	;;
 
-up*|sd*|rx*|rl*|rb*|raid*|ra*|hp*|hk*|hd*|ccd*)
-	case $i in
-	up*) dodisk up $U 2 13 $U 0;;
-	sd*) dodisk sd $U 20 59 $U 0;;
-	rx*) dodisk rx $U 12 30 $U 0;;
-	rl*) dodisk rl $U 14 32 $U 0;;
-	rb*) dodisk rb $U 11 23 $U 0;;
-	raid*) dodisk raid $U 25 73 $U 0;;
-	ra*) dodisk ra $U 9 9 $U 0;;
-	hp*) dodisk hp $U 0 4 $U 0;;
-	hk*) dodisk hk $U 3 11 $U 0;;
-	hd*) dodisk hd $U 19 58 $U 0;;
-	ccd*) dodisk ccd $U 17 54 $U 0;;
-	esac
+altq)
+	mkdir -p altq
+	chmod 755 altq
+	unit=0
+	for dev in altq cbq wfq afm fifoq red rio localq hfsc \
+	    cdnr blue priq; do
+		rm -f altq/$dev
+		mknod altq/$dev c 75 $unit
+		chmod 644 altq/$dev
+		unit=$(($unit + 1))
+	done
 	;;
 
+local)
+	umask 0
+	sh $0.local all
+	umask 77
+	;;
 *)
-	echo $i: unknown device
+	echo $i: invalid device
 	;;
+
 esac
 done
-}
-R "$@"
-if [ "$os" = "SunOS" ]; then
-	eo=transform
-	transform() {
-		case $mode in
-		600) mask=077;;
-		640) mask=027;;
-		660) mask=007;;
-		644) mask=022;;
-		666) mask=0;;
-		440) mask=227;;
-		esac
-		echo `echo "$@"|sed \
-		    's/mknod -m \([0-9]*\) /umask '$mask';mknod /;s/-m [0-9]* //g;\
-		    s/operator/5/g;s/root.kmem/root.2/g;s/root\./root:/g'`
-	}
-fi
-list="$RMlist"
-for mode in $modes; do
-	list="$list;${mklist[$mode]}"
-done
-for group in $groups; do
-	list="$list;${grplist[$group]}"
-done
-list="$list;$MKlist"
-if [ "$eo" = "echo" -o "$eo" = "transform" ]; then
-	$eo "$list"
-else
-	echo "$list" | sh
-fi