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

2 files changed, 17 insertions, 18 deletions

diff --git a/etc/etc.i386/MAKEDEV b/etc/etc.i386/MAKEDEV
index bdcf30d0bc0..6c99f730b35 100644
--- a/etc/etc.i386/MAKEDEV
+++ b/etc/etc.i386/MAKEDEV
@@ -4,7 +4,7 @@
 # generated from:
 #
 #	OpenBSD: etc.i386/MAKEDEV.md,v 1.79 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 
 #
@@ -69,7 +69,7 @@
 #	audio*	Audio devices
 #	bio	ioctl tunnel pseudo-device
 #	bktr*	Video frame grabbers
-#	bpf*	Berkeley Packet Filter
+#	bpf	Berkeley Packet Filter
 #	diskmap	Disk mapper
 #	drm*	Direct Rendering Manager
 #	fd	fd/* nodes
@@ -223,7 +223,7 @@ U=`unt $i`
 
 case $i in
 ramdisk)
-	R std bpf0 fd0 wd0 sd0 tty00 tty01 rd0 bio diskmap
+	R std bpf fd0 wd0 sd0 tty00 tty01 rd0 bio diskmap
 	R st0 cd0 ttyC0 wskbd0 wskbd1 wskbd2 apm random
 	;;
 
@@ -361,8 +361,9 @@ diskmap)
 	M diskmap c 91 0 640 operator
 	;;
 
-bpf*)
-	M bpf$U c 23 $U 600
+bpf)
+	M bpf c 23 0 600
+	M bpf0 c 23 0 600
 	;;
 
 bktr*)
@@ -570,16 +571,15 @@ all)
 	R ipmi0 amdmsr drm0 drm1 drm2 drm3 nvram gpio0 gpio1 gpio2
 	R bktr0 vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4 sd5 sd6 sd7
 	R sd8 sd9 cd0 cd1 rd0 tap0 tap1 tap2 tap3 tun0 tun1 tun2 tun3
-	R bio bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0
-	R fd1 fd1B fd1C fd1D fd1E fd1F fd1G fd1H fd0 fd0B fd0C fd0D
-	R fd0E fd0F fd0G fd0H diskmap vscsi0 ch0 audio0 audio1 audio2
-	R pvbus0 vmm fuse pppx hotplug ptm gpr0 local wscons pci0 pci1
-	R pci2 pci3 uall rmidi0 rmidi1 rmidi2 rmidi3 rmidi4 rmidi5
-	R rmidi6 rmidi7 tuner0 radio0 speaker video0 video1 uk0 random
-	R joy0 joy1 lpa0 lpa1 lpa2 lpt0 lpt1 lpt2 tty00 tty01 tty02
-	R tty03 tty04 tty05 tty06 tty07 tty08 tty09 tty0a tty0b ttyc0
-	R ttyc1 ttyc2 ttyc3 ttyc4 ttyc5 ttyc6 ttyc7 apm pf pctr wd0
-	R wd1 wd2 wd3 std st0 st1 fd
+	R bio pty0 fd1 fd1B fd1C fd1D fd1E fd1F fd1G fd1H fd0 fd0B
+	R fd0C fd0D fd0E fd0F fd0G fd0H diskmap vscsi0 ch0 audio0
+	R audio1 audio2 bpf pvbus0 vmm fuse pppx hotplug ptm gpr0
+	R local wscons pci0 pci1 pci2 pci3 uall rmidi0 rmidi1 rmidi2
+	R rmidi3 rmidi4 rmidi5 rmidi6 rmidi7 tuner0 radio0 speaker
+	R video0 video1 uk0 random joy0 joy1 lpa0 lpa1 lpa2 lpt0 lpt1
+	R lpt2 tty00 tty01 tty02 tty03 tty04 tty05 tty06 tty07 tty08
+	R tty09 tty0a tty0b ttyc0 ttyc1 ttyc2 ttyc3 ttyc4 ttyc5 ttyc6
+	R ttyc7 apm pf pctr wd0 wd1 wd2 wd3 std st0 st1 fd
 	;;
 
 wd*|sd*)
diff --git a/etc/etc.i386/MAKEDEV.md b/etc/etc.i386/MAKEDEV.md
index 1ac717bab39..e71049c734e 100644
--- a/etc/etc.i386/MAKEDEV.md
+++ b/etc/etc.i386/MAKEDEV.md
@@ -1,6 +1,6 @@
 define(MACHINE,i386)dnl
 vers(__file__,
-	{-$OpenBSD: MAKEDEV.md,v 1.79 2016/04/25 20:38:11 tedu Exp $-},
+	{-$OpenBSD: MAKEDEV.md,v 1.80 2016/04/28 18:17:31 natano Exp $-},
 etc.MACHINE)dnl
 dnl
 dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org>
@@ -99,7 +99,7 @@ dnl
 divert(__mddivert)dnl
 dnl
 ramdisk)
-	_recurse std bpf0 fd0 wd0 sd0 tty00 tty01 rd0 bio diskmap
+	_recurse std bpf fd0 wd0 sd0 tty00 tty01 rd0 bio diskmap
 	_recurse st0 cd0 ttyC0 wskbd0 wskbd1 wskbd2 apm random
 	;;
 
@@ -121,7 +121,6 @@ target(all, diskmap)dnl
 twrget(all, flo, fd, 0, 0B, 0C, 0D, 0E, 0F, 0G, 0H)dnl
 twrget(all, flo, fd, 1, 1B, 1C, 1D, 1E, 1F, 1G, 1H)dnl
 target(all, pty, 0)dnl
-target(all, bpf, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl
 target(all, bio)dnl
 target(all, tun, 0, 1, 2, 3)dnl
 target(all, tap, 0, 1, 2, 3)dnl