From a8c89524b91a8c823eccd1342ac80a27dfe17513 Mon Sep 17 00:00:00 2001
From: Martin Natano <natano@cvs.openbsd.org>
Date: Thu, 28 Apr 2016 18:17:33 +0000
Subject: Replace /dev/bpf[0-9] with /dev/bpf and /dev/bpf0. The /dev/bpf node
 is unused for now, but I plan to convert all programs in base to use it in a
 future diff. /dev/bpf0 is for compatibility with existing binaries and is to
 be removed after a transition period.

ok rpe krw, for the installer part
"Let's see it hit the tree." deraadt
---
 etc/etc.sgi/MAKEDEV | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'etc/etc.sgi/MAKEDEV')

diff --git a/etc/etc.sgi/MAKEDEV b/etc/etc.sgi/MAKEDEV
index b80d4656e5d..0546fb48f69 100644
--- a/etc/etc.sgi/MAKEDEV
+++ b/etc/etc.sgi/MAKEDEV
@@ -4,7 +4,7 @@
 # generated from:
 #
 #	OpenBSD: etc.sgi/MAKEDEV.md,v 1.45 2016/04/25 20:38:11 tedu Exp 
-#	OpenBSD: MAKEDEV.common,v 1.85 2016/02/05 06:29:45 uebayasi Exp 
+#	OpenBSD: MAKEDEV.common,v 1.86 2016/04/25 20:39:42 tedu Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.82 2016/03/12 17:58:59 espie Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -62,7 +62,7 @@
 # Special purpose devices:
 #	audio*	Audio devices
 #	bio	ioctl tunnel pseudo-device
-#	bpf*	Berkeley Packet Filter
+#	bpf	Berkeley Packet Filter
 #	diskmap	Disk mapper
 #	fd	fd/* nodes
 #	fuse	Userland Filesystem
@@ -277,8 +277,9 @@ diskmap)
 	M diskmap c 69 0 640 operator
 	;;
 
-bpf*)
-	M bpf$U c 12 $U 600
+bpf)
+	M bpf c 12 0 600
+	M bpf0 c 12 0 600
 	;;
 
 bio)
@@ -448,18 +449,17 @@ local)
 
 ramdisk)
 	R diskmap bio pty0 rd0 cd0 cd1 st0 st1 wd0 wd1 wd2 wd3 wd4
-	R sd0 sd1 sd2 sd3 sd4 tty00 tty01 bpf0 std
+	R sd0 sd1 sd2 sd3 sd4 tty00 tty01 bpf std
 	;;
 
 all)
 	R ttya ttyb vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4 sd5 sd6
 	R sd7 sd8 sd9 cd0 cd1 rd0 tap0 tap1 tap2 tap3 tun0 tun1 tun2
-	R tun3 bio bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9
-	R pty0 pty1 pty2 diskmap vscsi0 ch0 audio0 audio1 audio2 fuse
-	R pppx hotplug ptm local wscons pci0 pci1 pci2 pci3 uall
-	R video0 video1 uk0 random tty00 tty01 tty02 tty03 tty04 tty05
-	R tty06 tty07 tty08 tty09 tty0a tty0b pf wd0 wd1 wd2 wd3 std
-	R st0 st1 fd
+	R tun3 bio pty0 pty1 pty2 diskmap vscsi0 ch0 audio0 audio1
+	R audio2 bpf fuse pppx hotplug ptm local wscons pci0 pci1 pci2
+	R pci3 uall video0 video1 uk0 random tty00 tty01 tty02 tty03
+	R tty04 tty05 tty06 tty07 tty08 tty09 tty0a tty0b pf wd0 wd1
+	R wd2 wd3 std st0 st1 fd
 	;;
 
 wd*|sd*)
-- 
cgit v1.2.3