remove altq entries. altq is now handled through pf.

ok, deraadt@

14 files changed, 16 insertions, 152 deletions

diff --git a/etc/etc.alpha/MAKEDEV b/etc/etc.alpha/MAKEDEV
index 64e3989712d..8167e1ddb2f 100644
--- a/etc/etc.alpha/MAKEDEV
+++ b/etc/etc.alpha/MAKEDEV
@@ -73,7 +73,6 @@
 #	ch*	SCSI media changer
 #	pf*	Packet Filter
 #	bpf*	Berkeley Packet Filter
-#	altq/	ALTQ control interface
 #	iop*	I2O controller device
 #	pci	PCI bus device
 #	usbs	make USB devices
@@ -327,14 +326,6 @@ iop*)
 	M iop$U c 54 $U 660
 	;;
 
-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 53 $U 644
-		U=$(($U+1))
-	done
-	;;
-
 bpf*)
 	M bpf$U c 11 $U 600
 	;;
@@ -501,7 +492,7 @@ all)
 	R rmidi2 rmidi3 rmidi4 rmidi5 rmidi6 rmidi7 music0 speaker
 	R audio0 uk0 random lpa0 lpa1 lpa2 lpt0 lpt1 lpt2 mmclock lkm
 	R tty00 tty01 tty02 tty03 ttyc0 ttyc1 ttyc2 ttyc3 ttyc4 ttyc5
-	R ttyc6 ttyc7 ttyB0 ttyB1 ttyB2 ttyB3 ttyB4 ttyB5 pf altq
+	R ttyc6 ttyc7 ttyB0 ttyB1 ttyB2 ttyB3 ttyB4 ttyB5 pf
 	R systrace wd0 wd1 wd2 wd3 raid0 raid1 raid2 raid3 std st0 st1
 	R fd
 	;;
diff --git a/etc/etc.amiga/MAKEDEV b/etc/etc.amiga/MAKEDEV
index 47ed684964d..1a5d47d7d11 100644
--- a/etc/etc.amiga/MAKEDEV
+++ b/etc/etc.amiga/MAKEDEV
@@ -77,7 +77,6 @@
 #	audio*	audio device
 #	xfs*	XFS filesystem devices
 #	ch*	SCSI media changer
-#	altq/	ALTQ control interface
 #	fd	makes fd/* for the fdescfs
 #	systrace*	system call tracing device
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
@@ -303,14 +302,6 @@ fd)
 	MKlist="$MKlist;chmod 555 fd"
 	;;
 
-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 52 $U 644
-		U=$(($U+1))
-	done
-	;;
-
 ch*)
 	M ch$U c 40 $U 660 operator
 	;;
@@ -451,7 +442,7 @@ all)
 	R grf3 grf4 grf5 grf6 audio0 uk0 random 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 systrace fd0 fd1 fd2 fd3 wd0 wd1 wd2 wd3
+	R ttyA0 ttyA1 pf systrace fd0 fd1 fd2 fd3 wd0 wd1 wd2 wd3
 	R std st0 st1 fd
 	;;
 
diff --git a/etc/etc.hp300/MAKEDEV b/etc/etc.hp300/MAKEDEV
index 1f4faecd082..697fbd7fe42 100644
--- a/etc/etc.hp300/MAKEDEV
+++ b/etc/etc.hp300/MAKEDEV
@@ -66,7 +66,6 @@
 #	lkm	loadable kernel modules interface
 #	*random	inkernel random data source
 #	xfs*	XFS filesystem devices
-#	altq/	ALTQ control interface
 #	systrace*	system call tracing device
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 T=$0
@@ -300,14 +299,6 @@ systrace)
 	M systrace c 50 0 644
 	;;
 
-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 52 $U 644
-		U=$(($U+1))
-	done
-	;;
-
 xfs*)
 	M xfs$U c 51 $U 600
 	;;
@@ -403,7 +394,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 systrace std fd
+	R apci0 random lkm pf systrace std fd
 	;;
 
 sd*|hd*|ccd*)
diff --git a/etc/etc.hppa/MAKEDEV b/etc/etc.hppa/MAKEDEV
index 273b9d6fd07..b3025980eeb 100644
--- a/etc/etc.hppa/MAKEDEV
+++ b/etc/etc.hppa/MAKEDEV
@@ -58,7 +58,6 @@
 #	tun*	network tunnel driver
 #	pf*	Packet Filter
 #	lkm	loadable kernel modules interface
-#	altq/	ALTQ control interface
 #	*random	inkernel random data source
 #	xfs*	XFS filesystem devices
 #	ch*	SCSI media changer
@@ -256,14 +255,6 @@ xfs*)
 	done
 	;;
 
-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 33 $U 644
-		U=$(($U+1))
-	done
-	;;
-
 lkm)
 	M lkm c 19 0 640 kmem
 	;;
@@ -378,7 +369,7 @@ all)
 	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 audio0 uk0 random lpa0 lpa1 lpa2 lpt0
-	R lpt1 lpt2 lkm tty00 tty01 tty02 tty03 crypto pf altq
+	R lpt1 lpt2 lkm tty00 tty01 tty02 tty03 crypto pf
 	R systrace std st0 st1 fd
 	;;
 
diff --git a/etc/etc.i386/MAKEDEV b/etc/etc.i386/MAKEDEV
index 39f95f2d1b4..9cbd9f4d22e 100644
--- a/etc/etc.i386/MAKEDEV
+++ b/etc/etc.i386/MAKEDEV
@@ -83,7 +83,6 @@
 #	bpf*	Berkeley Packet Filter
 #	speaker	pc speaker
 #	lkm	loadable kernel modules interface
-#	altq/	ALTQ control interface
 #	audio*	audio device
 #	rmidi*	raw midi devices
 #	music*	midi devices
@@ -362,14 +361,6 @@ audio*)
 	MKlist="$MKlist;[ -e audioctl ] || ln -s audioctl$U audioctl"
 	;;
 
-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 74 $U 644
-		U=$(($U+1))
-	done
-	;;
-
 lkm)
 	M lkm c 28 0 640 kmem
 	;;
@@ -576,7 +567,7 @@ all)
 	R tuner0 radio0 music0 speaker audio0 wdt0 wt0 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 altq pctr systrace wd0 wd1 wd2 wd3 raid0 raid1
+	R crypto pf pctr systrace wd0 wd1 wd2 wd3 raid0 raid1
 	R raid2 raid3 std st0 st1 fd mcd0
 	;;
 
diff --git a/etc/etc.mac68k/MAKEDEV b/etc/etc.mac68k/MAKEDEV
index ca5fdf6f60c..33669c543ed 100644
--- a/etc/etc.mac68k/MAKEDEV
+++ b/etc/etc.mac68k/MAKEDEV
@@ -58,7 +58,6 @@
 #	bpf*	Berkeley Packet Filter
 #	tun*	network tunnel driver
 #	pf*	Packet Filter
-#	altq/	ALTQ control interface
 #	lkm	loadable kernel modules interface
 #	*random	inkernel random data source
 #	uk*	SCSI Unknown device
@@ -278,14 +277,6 @@ lkm)
 	M lkm c 25 0 640 kmem
 	;;
 
-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 52 $U 644
-		U=$(($U+1))
-	done
-	;;
-
 pf*)
 	M pf c 35 0 600
 	;;
@@ -363,7 +354,7 @@ all)
 	R bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0 pty1 pty2
 	R xfs0 ss0 ss1 ch0 vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4
 	R local grf0 grf1 grf2 grf3 adb asc0 uk0 random lkm ttye0
-	R tty00 tty01 pf altq systrace std st0 st1 fd
+	R tty00 tty01 pf systrace std st0 st1 fd
 	;;
 
 sd*|ccd*)
diff --git a/etc/etc.macppc/MAKEDEV b/etc/etc.macppc/MAKEDEV
index 98663ecafb2..7e459f9c6f9 100644
--- a/etc/etc.macppc/MAKEDEV
+++ b/etc/etc.macppc/MAKEDEV
@@ -78,7 +78,6 @@
 #	uk*	SCSI Unknown device
 #	ss*	SCSI scanners
 #	xfs*	XFS filesystem devices
-#	altq/	ALTQ control interface
 #	iop*	I2O controller device
 #	pf*	Packet Filter
 #	crypto	hardware crypto access driver
@@ -265,14 +264,6 @@ iop*)
 	M iop$U c 73 $U 660
 	;;
 
-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 72 $U 644
-		U=$(($U+1))
-	done
-	;;
-
 xfs*)
 	M xfs$U c 51 $U 600
 	;;
@@ -463,7 +454,7 @@ all)
 	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 tuner0 radio0 audio0 uk0
-	R random lkm tty00 tty01 tty02 tty03 apm crypto pf altq
+	R random lkm tty00 tty01 tty02 tty03 apm crypto pf
 	R systrace wd0 wd1 wd2 wd3 raid0 raid1 raid2 raid3 std st0 st1
 	R fd
 	;;
diff --git a/etc/etc.mvme68k/MAKEDEV b/etc/etc.mvme68k/MAKEDEV
index 5c56c60c70d..a488acd4bdf 100644
--- a/etc/etc.mvme68k/MAKEDEV
+++ b/etc/etc.mvme68k/MAKEDEV
@@ -63,7 +63,6 @@
 #	pf*	Packet Filter
 #	lkm	loadable kernel modules interface
 #	*random	inkernel random data source
-#	altq/	ALTQ control interface
 #	xfs*	XFS filesystem devices
 #	sram0	static memory access
 #	nvram0	non-volatile memory access
@@ -229,14 +228,6 @@ xfs*)
 	M xfs$U c 51 $U 600
 	;;
 
-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 52 $U 644
-		U=$(($U+1))
-	done
-	;;
-
 *random)
 	n=0
 	for pre in " " s u p a
@@ -397,7 +388,7 @@ all)
 	R vnd2 vnd3 sd0 sd1 sd2 sd3 sd4 cd0 cd1 rd0 tun0 tun1 tun2
 	R tun3 bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0
 	R pty1 pty2 xfs0 ss0 ss1 vmel0 vmes0 flash0 nvram0 sram0 uk0
-	R random lkm pf altq systrace std st0 st1 fd
+	R random lkm pf systrace std st0 st1 fd
 	;;
 
 sd*|ccd*)
diff --git a/etc/etc.mvme88k/MAKEDEV b/etc/etc.mvme88k/MAKEDEV
index ed3f10c2255..be3f5833488 100644
--- a/etc/etc.mvme88k/MAKEDEV
+++ b/etc/etc.mvme88k/MAKEDEV
@@ -58,7 +58,6 @@
 #	pf*	Packet Filter
 #	lkm	loadable kernel modules interface
 #	*random	inkernel random data source
-#	altq/	ALTQ control interface
 #	xfs*	XFS filesystem devices
 #	sram0	static memory access
 #	nvram0	non-volatile memory access
@@ -219,14 +218,6 @@ xfs*)
 	M xfs$U c 51 $U 600
 	;;
 
-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 52 $U 644
-		U=$(($U+1))
-	done
-	;;
-
 *random)
 	n=0
 	for pre in " " s u p a
@@ -353,7 +344,7 @@ all)
 	R vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4 cd0 cd1 rd0 tun0 tun1
 	R tun2 tun3 bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9
 	R pty0 pty1 pty2 xfs0 vmel0 vmes0 nvram0 sram0 random lkm pf
-	R altq systrace std st0 st1 fd
+	R systrace std st0 st1 fd
 	;;
 
 sd*|ccd*)
diff --git a/etc/etc.mvmeppc/MAKEDEV b/etc/etc.mvmeppc/MAKEDEV
index 43c62abbbc8..ab3019d0a88 100644
--- a/etc/etc.mvmeppc/MAKEDEV
+++ b/etc/etc.mvmeppc/MAKEDEV
@@ -1,5 +1,5 @@
 #!/bin/sh -
-#	$OpenBSD: MAKEDEV,v 1.8 2002/06/09 05:58:39 todd Exp $
+#	$OpenBSD: MAKEDEV,v 1.9 2002/12/05 03:00:27 kjc Exp $
 #
 # Copyright (c) 1990 The Regents of the University of California.
 # All rights reserved.
@@ -76,7 +76,6 @@
 #	tun*	network tunnel driver
 #	lkm	loadable kernel modules interface
 #	*random	inkernal random data source
-#	altq	ALTQ control interface
 #
 
 PATH=/sbin:/bin:/usr/bin:/usr/sbin
@@ -162,7 +161,7 @@ all)
 	sh $this random uk0 uk1 ss0 ss1
 	sh $this wscons
 	sh $this pci
-	sh $this lkm xfs0 altq
+	sh $this lkm xfs0
 	sh $this usbs
 	;;
 
@@ -633,19 +632,6 @@ xfs*)
 	chown root.wheel xfs$unit
 	;;
 
-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 71 $unit
-		chmod 644 altq/$dev
-		unit=$(($unit + 1))
-	done
-	;;
-
 *)
 	echo $i: unknown device
 esac
diff --git a/etc/etc.sparc/MAKEDEV b/etc/etc.sparc/MAKEDEV
index 7ca5304bf05..b9127ed4700 100644
--- a/etc/etc.sparc/MAKEDEV
+++ b/etc/etc.sparc/MAKEDEV
@@ -68,7 +68,6 @@
 #	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
@@ -289,14 +288,6 @@ lkm)
 	M lkm c 112 0 640 kmem
 	;;
 
-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 125 $U 644
-		U=$(($U+1))
-	done
-	;;
-
 pf*)
 	M pf c 59 0 600
 	;;
@@ -481,7 +472,7 @@ 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 cuaa cuab cuac cuad
-	R ttya ttyb ttyc ttyd wscons audio0 uk0 random lkm pf altq
+	R ttya ttyb ttyc ttyd wscons audio0 uk0 random lkm pf
 	R systrace xd0 xd1 xd2 xd3 raid0 raid1 raid2 raid3 std st0 st1
 	R fd
 	;;
diff --git a/etc/etc.sparc64/MAKEDEV b/etc/etc.sparc64/MAKEDEV
index 76920de8203..37c161b6fa3 100644
--- a/etc/etc.sparc64/MAKEDEV
+++ b/etc/etc.sparc64/MAKEDEV
@@ -85,7 +85,6 @@
 #	uk*	SCSI Unknown device
 #	audio*	audio device
 #	pf*	Packet Filter
-#	altq/	ALTQ control interface
 #	bpf*	Berkeley Packet Filter
 #	tun*	network tunnel driver
 #	lkm	loadable kernel modules interface
@@ -318,14 +317,6 @@ bpf*)
 	M bpf$U c 105 $U 600
 	;;
 
-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 74 $U 644
-		U=$(($U+1))
-	done
-	;;
-
 pf*)
 	M pf c 73 0 600
 	;;
@@ -569,7 +560,7 @@ all)
 	R fd0E fd0F fd0G fd0H xfs0 ss0 ss1 ch0 ses0 ccd0 ccd1 ccd2
 	R ccd3 wscons pci usbs audio0 uk0 random lpa0 lpa1 lpa2 lpt0
 	R lpt1 lpt2 lkm tty00 tty01 tty02 tty03 ttyh0 ttyh1 crypto pf
-	R altq systrace wd0 wd1 wd2 wd3 raid0 raid1 raid2 raid3 std
+	R systrace wd0 wd1 wd2 wd3 raid0 raid1 raid2 raid3 std
 	R st0 st1 fd
 	;;
 
diff --git a/etc/etc.sun3/MAKEDEV b/etc/etc.sun3/MAKEDEV
index f6a00671572..2cf31c29270 100644
--- a/etc/etc.sun3/MAKEDEV
+++ b/etc/etc.sun3/MAKEDEV
@@ -64,7 +64,6 @@
 #	ss*	SCSI scanners
 #	fd	makes fd/* for the fdescfs
 #	xfs*	XFS filesystem devices
-#	altq/	ALTQ control interface
 #	systrace*	system call tracing device
 # XXX - Keep /usr/etc so SunOS can find chown
 test -d /usr/etc && PATH=$PATH:/usr/etc
@@ -219,14 +218,6 @@ systrace)
 	M systrace c 86 0 644
 	;;
 
-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 85 $U 644
-		U=$(($U+1))
-	done
-	;;
-
 xfs*)
 	M xfs$U c 51 $U 600
 	;;
@@ -344,7 +335,7 @@ all)
 	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 uk0 random ttya ttyb
-	R ttyc ttyd pf altq systrace xd0 xd1 xd2 xd3 std st0 st1 fd
+	R ttyc ttyd pf systrace xd0 xd1 xd2 xd3 std st0 st1 fd
 	;;
 
 xd*|xy*|sd*|ccd*)
diff --git a/etc/etc.vax/MAKEDEV b/etc/etc.vax/MAKEDEV
index dbb5645cf84..f5040d3a74e 100644
--- a/etc/etc.vax/MAKEDEV
+++ b/etc/etc.vax/MAKEDEV
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: MAKEDEV,v 1.48 2002/06/24 10:43:31 hugh Exp $
+#	$OpenBSD: MAKEDEV,v 1.49 2002/12/05 03:00:27 kjc Exp $
 #	$NetBSD: MAKEDEV,v 1.30 2000/01/21 12:28:29 tsutsui Exp $
 #
 #	@(#)MAKEDEV	8.1 (Berkeley) 6/9/93
@@ -61,7 +61,6 @@
 #	uk*	SCSI unknown
 #	ch*	SCSI changer
 #	*random	Random number generator
-#	altq	ALTQ control interface
 #	systrace* system call tracing device
 #
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
@@ -72,7 +71,7 @@ do
 case $i in
 
 all)
-	sh $0 std fd vnd0 ccd0 pty0 pty1 lkm random altq
+	sh $0 std fd vnd0 ccd0 pty0 pty1 lkm random
 	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
@@ -654,19 +653,6 @@ qv0)
 	mknod mouse c 40 2
 	;;
 
-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
-	;;
-
 systrace)
 	rm -f systrace
 	mknod systrace c 49 0