16 partitions, fix pcmcia and joy

1 files changed, 40 insertions, 53 deletions

diff --git a/etc/etc.i386/MAKEDEV b/etc/etc.i386/MAKEDEV
index 7ddbead83f5..ef37e077d89 100644
--- a/etc/etc.i386/MAKEDEV
+++ b/etc/etc.i386/MAKEDEV
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: MAKEDEV,v 1.20 1996/08/29 13:22:23 deraadt Exp $
+#	$OpenBSD: MAKEDEV,v 1.21 1996/09/12 02:40:42 deraadt Exp $
 #	$NetBSD: MAKEDEV,v 1.40 1996/03/31 00:50:47 perry Exp $
 #
 # Copyright (c) 1990 The Regents of the University of California.
@@ -179,24 +179,40 @@ ccd*|fd*|sd*|vnd*|wd*)
 	wd*) name=wd; blk=0; chr=3;;
 	esac
 	rm -f $name$unit? r$name$unit?
-	mknod ${name}${unit}a	b $blk `expr $unit '*' 8 + 0`
-	mknod ${name}${unit}b	b $blk `expr $unit '*' 8 + 1`
-	mknod ${name}${unit}c	b $blk `expr $unit '*' 8 + 2`
-	mknod ${name}${unit}d	b $blk `expr $unit '*' 8 + 3`
-	mknod ${name}${unit}e	b $blk `expr $unit '*' 8 + 4`
-	mknod ${name}${unit}f	b $blk `expr $unit '*' 8 + 5`
-	mknod ${name}${unit}g	b $blk `expr $unit '*' 8 + 6`
-	mknod ${name}${unit}h	b $blk `expr $unit '*' 8 + 7`
-	mknod r${name}${unit}a	c $chr `expr $unit '*' 8 + 0`
-	mknod r${name}${unit}b	c $chr `expr $unit '*' 8 + 1`
-	mknod r${name}${unit}c	c $chr `expr $unit '*' 8 + 2`
-	mknod r${name}${unit}d	c $chr `expr $unit '*' 8 + 3`
-	mknod r${name}${unit}e	c $chr `expr $unit '*' 8 + 4`
-	mknod r${name}${unit}f	c $chr `expr $unit '*' 8 + 5`
-	mknod r${name}${unit}g	c $chr `expr $unit '*' 8 + 6`
-	mknod r${name}${unit}h	c $chr `expr $unit '*' 8 + 7`
-	chgrp operator ${name}${unit}[a-h] r${name}${unit}[a-h]
-	chmod 640 ${name}${unit}[a-h] r${name}${unit}[a-h]
+	mknod ${name}${unit}a	b $blk `expr $unit '*' 16 + 0`
+	mknod ${name}${unit}b	b $blk `expr $unit '*' 16 + 1`
+	mknod ${name}${unit}c	b $blk `expr $unit '*' 16 + 2`
+	mknod ${name}${unit}d	b $blk `expr $unit '*' 16 + 3`
+	mknod ${name}${unit}e	b $blk `expr $unit '*' 16 + 4`
+	mknod ${name}${unit}f	b $blk `expr $unit '*' 16 + 5`
+	mknod ${name}${unit}g	b $blk `expr $unit '*' 16 + 6`
+	mknod ${name}${unit}h	b $blk `expr $unit '*' 16 + 7`
+	mknod ${name}${unit}i	b $blk `expr $unit '*' 16 + 8`
+	mknod ${name}${unit}j	b $blk `expr $unit '*' 16 + 9`
+	mknod ${name}${unit}k	b $blk `expr $unit '*' 16 + 10`
+	mknod ${name}${unit}l	b $blk `expr $unit '*' 16 + 11`
+	mknod ${name}${unit}m	b $blk `expr $unit '*' 16 + 12`
+	mknod ${name}${unit}n	b $blk `expr $unit '*' 16 + 13`
+	mknod ${name}${unit}o	b $blk `expr $unit '*' 16 + 14`
+	mknod ${name}${unit}p	b $blk `expr $unit '*' 16 + 15`
+	mknod r${name}${unit}a	c $chr `expr $unit '*' 16 + 0`
+	mknod r${name}${unit}b	c $chr `expr $unit '*' 16 + 1`
+	mknod r${name}${unit}c	c $chr `expr $unit '*' 16 + 2`
+	mknod r${name}${unit}d	c $chr `expr $unit '*' 16 + 3`
+	mknod r${name}${unit}e	c $chr `expr $unit '*' 16 + 4`
+	mknod r${name}${unit}f	c $chr `expr $unit '*' 16 + 5`
+	mknod r${name}${unit}g	c $chr `expr $unit '*' 16 + 6`
+	mknod r${name}${unit}h	c $chr `expr $unit '*' 16 + 7`
+	mknod r${name}${unit}i	c $chr `expr $unit '*' 16 + 8`
+	mknod r${name}${unit}j	c $chr `expr $unit '*' 16 + 9`
+	mknod r${name}${unit}k	c $chr `expr $unit '*' 16 + 10`
+	mknod r${name}${unit}l	c $chr `expr $unit '*' 16 + 11`
+	mknod r${name}${unit}m	c $chr `expr $unit '*' 16 + 12`
+	mknod r${name}${unit}n	c $chr `expr $unit '*' 16 + 13`
+	mknod r${name}${unit}o	c $chr `expr $unit '*' 16 + 14`
+	mknod r${name}${unit}p	c $chr `expr $unit '*' 16 + 15`
+	chgrp operator ${name}${unit}[a-p] r${name}${unit}[a-p]
+	chmod 640 ${name}${unit}[a-p] r${name}${unit}[a-p]
 	umask 77
 	;;
 
@@ -274,10 +290,10 @@ cd*|mcd*|acd*)
 	acd*) name=acd; blk=18; chr=24;;
 	esac
 	rm -f $name$unit? r$name$unit?
-	mknod ${name}${unit}a	b $blk `expr $unit '*' 8 + 0`
-	mknod ${name}${unit}d	b $blk `expr $unit '*' 8 + 3`
-	mknod r${name}${unit}a	c $chr `expr $unit '*' 8 + 0`
-	mknod r${name}${unit}d	c $chr `expr $unit '*' 8 + 3`
+	mknod ${name}${unit}a	b $blk `expr $unit '*' 16 + 0`
+	mknod ${name}${unit}d	b $blk `expr $unit '*' 16 + 3`
+	mknod r${name}${unit}a	c $chr `expr $unit '*' 16 + 0`
+	mknod r${name}${unit}d	c $chr `expr $unit '*' 16 + 3`
 	chgrp operator ${name}${unit}[a-h] r${name}${unit}[a-h]
 	chmod 640 ${name}${unit}[a-h] r${name}${unit}[a-h]
 	umask 77
@@ -361,36 +377,7 @@ joy*)
 	chown root.wheel joy$unit
 	chmod 666 joy$unit
 	;;
-	
-pcmcia*)
-	rm -rf pcmcia
-	mkdir pcmcia
-	mknod pcmcia/bus c 26 32
-	mknod pcmcia/chip0 c 26 16
-	mknod pcmcia/chip1 c 26 17
-	mknod pcmcia/chip2 c 26 18
-	mknod pcmcia/chip3 c 26 19
-	mknod pcmcia/slot0 c 26 0
-	mknod pcmcia/slot1 c 26 1
-	mknod pcmcia/slot2 c 26 2
-	mknod pcmcia/slot3 c 26 3
-	mknod pcmcia/slot4 c 26 4
-	mknod pcmcia/slot5 c 26 5
-	mknod pcmcia/slot6 c 26 6
-	mknod pcmcia/slot7 c 26 7
-	chown -R root.wheel pcmcia
-	chmod 700 pcmcia
-	chmod 600 pcmcia/*
-	;;
-	
-joy*)
-	unit=`expr $i : 'joy\(.*\)'`
-	rm -f joy$unit
-	mknod joy$unit c 26 $unit
-	chown root.wheel joy$unit
-	chmod 666 joy$unit
-	;;
-	
+
 apm*)
 	rm -f apm apmctl
 	mknod apm c 21 0