Don't call the fictious `MAKEDEV' from the path "/sbin:/bin" when we

recurse.  Rather recurse on ourself (as we know our own name).

1 files changed, 69 insertions, 69 deletions

diff --git a/etc/MAKEDEV b/etc/MAKEDEV
index 27fcc31..14dc487 100644
--- a/etc/MAKEDEV
+++ b/etc/MAKEDEV
@@ -252,77 +252,77 @@ for i in $*; do
 case $i in
 
 all)
-	sh MAKEDEV std					# standard
-	sh MAKEDEV fd0 fd1				# bdev, floppy disk
-	sh MAKEDEV da0 da1 da2 da3 			# bdev, SCSI disk
-	sh MAKEDEV ata					# ATA control
-	sh MAKEDEV ad0 ad1 ad2 ad3 			# bdev, ATA disk
-	sh MAKEDEV ar0 ar1 				# bdev, ATA RAID disk
-	sh MAKEDEV acd0 acd0t afd0 ast0			# bdev, ATAPI devices
-	sh MAKEDEV wd0 wd1 wd2 wd3			# bdev, OLD disk
-	sh MAKEDEV wcd0 wfd0 wst0			# bdev, OLD ATAPI devs
-	sh MAKEDEV vn0					# bdev, virtual disk
-	sh MAKEDEV cd0 matcd0 mcd0 scd0			# bdev, cdrom
-	sh MAKEDEV sa0 wt0				# bdev, tape
-	sh MAKEDEV vty12				# cdev, virtual tty
-	sh MAKEDEV cuaa0 cuaa1 cuaa2 cuaa3		# cdev, serial tty
-	sh MAKEDEV pty0					# cdev, pseudo tty
-	sh MAKEDEV ttyd0 ttyd1 ttyd2 ttyd3		# cdev, serial tty
-	sh MAKEDEV kbd0 kbd1				# cdev, keyboard
-	sh MAKEDEV mse0 psm0 jogdial sysmouse		# cdev, mouse
-	sh MAKEDEV pcaudio speaker			# cdev, noise
-	sh MAKEDEV lpt0 lpt1 lpt2			# cdev, printer
-	sh MAKEDEV ppi0 ppi1 ppi2			# cdev, parallel port
-	sh MAKEDEV iic0 iic1				# cdev, I2C device
-	sh MAKEDEV smb0 smb1				# cdev, SMBus device
-	sh MAKEDEV usb usb0 uhid0 ums0 ulpt0 ugen0	# cdev, USB devices
-	sh MAKEDEV urio0 uscanner0 umodem0		# cdev, USB devices too
-	sh MAKEDEV bpf0 bpf1 bpf2 bpf3 			# cdev, network
-	sh MAKEDEV ipl tun0 tun1 tun2 tun3		# cdev, network
-	sh MAKEDEV tap0 tap1 tap2 tap3			# cdev, network
-	sh MAKEDEV ch0 perfmon tw0			# cdev, miscellaneous
-	sh MAKEDEV acpi					# cdev, ACPI
-	sh MAKEDEV apm apmctl card0 card1 card2 card3	# cdev, laptop
-	sh MAKEDEV pass4 xpt2				# cdev, CAM
-	sh MAKEDEV i4b i4bctl i4btrc0 i4btrc1		# cdev, ISDN
-	sh MAKEDEV i4btel0 i4btel1 i4bteld0 i4bteld1	# cdev, ISDN
-	sh MAKEDEV i4brbch0 i4brbch1			# cdev, ISDN
-	sh MAKEDEV agpgart				# cdev, AGP
+	sh $0 std					# standard
+	sh $0 fd0 fd1				# bdev, floppy disk
+	sh $0 da0 da1 da2 da3 			# bdev, SCSI disk
+	sh $0 ata					# ATA control
+	sh $0 ad0 ad1 ad2 ad3 			# bdev, ATA disk
+	sh $0 ar0 ar1				# bdev, ATA RAID disk
+	sh $0 acd0 acd0t afd0 ast0			# bdev, ATAPI devices
+	sh $0 wd0 wd1 wd2 wd3			# bdev, OLD disk
+	sh $0 wcd0 wfd0 wst0			# bdev, OLD ATAPI devs
+	sh $0 vn0					# bdev, virtual disk
+	sh $0 cd0 matcd0 mcd0 scd0			# bdev, cdrom
+	sh $0 sa0 wt0				# bdev, tape
+	sh $0 vty12				# cdev, virtual tty
+	sh $0 cuaa0 cuaa1 cuaa2 cuaa3		# cdev, serial tty
+	sh $0 pty0					# cdev, pseudo tty
+	sh $0 ttyd0 ttyd1 ttyd2 ttyd3		# cdev, serial tty
+	sh $0 kbd0 kbd1				# cdev, keyboard
+	sh $0 mse0 psm0 jogdial sysmouse		# cdev, mouse
+	sh $0 pcaudio speaker			# cdev, noise
+	sh $0 lpt0 lpt1 lpt2			# cdev, printer
+	sh $0 ppi0 ppi1 ppi2			# cdev, parallel port
+	sh $0 iic0 iic1				# cdev, I2C device
+	sh $0 smb0 smb1				# cdev, SMBus device
+	sh $0 usb usb0 uhid0 ums0 ulpt0 ugen0	# cdev, USB devices
+	sh $0 urio0 uscanner0 umodem0		# cdev, USB devices too
+	sh $0 bpf0 bpf1 bpf2 bpf3 			# cdev, network
+	sh $0 ipl tun0 tun1 tun2 tun3		# cdev, network
+	sh $0 tap0 tap1 tap2 tap3			# cdev, network
+	sh $0 ch0 perfmon tw0			# cdev, miscellaneous
+	sh $0 acpi					# cdev, ACPI
+	sh $0 apm apmctl card0 card1 card2 card3	# cdev, laptop
+	sh $0 pass4 xpt2				# cdev, CAM
+	sh $0 i4b i4bctl i4btrc0 i4btrc1		# cdev, ISDN
+	sh $0 i4btel0 i4btel1 i4bteld0 i4bteld1	# cdev, ISDN
+	sh $0 i4brbch0 i4brbch1			# cdev, ISDN
+	sh $0 agpgart				# cdev, AGP
 	;;
 
 # a much restricted set of the above, to save precious i-nodes on the
 # fixit floppy
 fixit)
-	sh MAKEDEV std					# standard
-	sh MAKEDEV fd0					# bdev, floppy disk
-	sh MAKEDEV da0 					# bdev, SCSI disk
-	sh MAKEDEV ad0		 			# bdev, ATA disk
-	sh MAKEDEV acd0 afd0 ast0			# bdev, ATAPI devices
-	sh MAKEDEV wd0					# bdev, OLD disk
-	sh MAKEDEV wcd0 wfd0 wst0			# bdev, OLD ATAPI devs
-	sh MAKEDEV vn0					# bdev, virtual disk
-	sh MAKEDEV cd0					# bdev, cdrom
-	sh MAKEDEV sa0					# bdev, tape
-	sh MAKEDEV vty2					# cdev, virtual tty
-	sh MAKEDEV cuaa0				# cdev, serial tty
-	sh MAKEDEV pty0					# cdev, pseudo tty
-	sh MAKEDEV ttyd0				# cdev, serial tty
-	sh MAKEDEV kbd0					# cdev, keyboard
-	sh MAKEDEV mse0 psm0 jogdial sysmouse		# cdev, mouse
-	sh MAKEDEV lpt0					# cdev, printer
-	sh MAKEDEV ppi0					# cdev, parallel port
-	sh MAKEDEV iic0					# cdev, I2C device
-	sh MAKEDEV smb0					# cdev, SMBus device
-	sh MAKEDEV ums0					# cdev, USB devices
-	sh MAKEDEV tun0					# cdev, network
-	sh MAKEDEV tap0					# cdev, network
-	sh MAKEDEV ch0					# cdev, miscellaneous
-	sh MAKEDEV acpi					# cdev, ACPI
-	sh MAKEDEV apm apmctl card0			# cdev, laptop
-	sh MAKEDEV pass1 xpt1				# cdev, CAM
-	sh MAKEDEV i4b i4bctl i4btrc0 i4btrc1		# cdev, ISDN
-	sh MAKEDEV i4btel0 i4bteld0		 	# cdev, ISDN
-	sh MAKEDEV i4brbch0				# cdev, ISDN
+	sh $0 std					# standard
+	sh $0 fd0					# bdev, floppy disk
+	sh $0 da0 					# bdev, SCSI disk
+	sh $0 ad0		 			# bdev, ATA disk
+	sh $0 acd0 afd0 ast0			# bdev, ATAPI devices
+	sh $0 wd0					# bdev, OLD disk
+	sh $0 wcd0 wfd0 wst0			# bdev, OLD ATAPI devs
+	sh $0 vn0					# bdev, virtual disk
+	sh $0 cd0					# bdev, cdrom
+	sh $0 sa0					# bdev, tape
+	sh $0 vty2					# cdev, virtual tty
+	sh $0 cuaa0				# cdev, serial tty
+	sh $0 pty0					# cdev, pseudo tty
+	sh $0 ttyd0				# cdev, serial tty
+	sh $0 kbd0					# cdev, keyboard
+	sh $0 mse0 psm0 jogdial sysmouse		# cdev, mouse
+	sh $0 lpt0					# cdev, printer
+	sh $0 ppi0					# cdev, parallel port
+	sh $0 iic0					# cdev, I2C device
+	sh $0 smb0					# cdev, SMBus device
+	sh $0 ums0					# cdev, USB devices
+	sh $0 tun0					# cdev, network
+	sh $0 tap0					# cdev, network
+	sh $0 ch0					# cdev, miscellaneous
+	sh $0 acpi					# cdev, ACPI
+	sh $0 apm apmctl card0			# cdev, laptop
+	sh $0 pass1 xpt1				# cdev, CAM
+	sh $0 i4b i4bctl i4btrc0 i4btrc1		# cdev, ISDN
+	sh $0 i4btel0 i4bteld0		 	# cdev, ISDN
+	sh $0 i4brbch0				# cdev, ISDN
 	rm -f fd/[1-9]?
 	;;
 
@@ -354,7 +354,7 @@ std)
 	;;
 
 jail)
-	sh MAKEDEV std pty0
+	sh $0 std pty0
 	rm mem kmem pci io klog console		# for security
 	ln -sf null mem			# for libkvm (ab)users
 	ln -sf null kmem		# --//--
@@ -618,7 +618,7 @@ aacd*|ad*|ar*|afd*|amrd*|da*|fla*|idad*|md*|mlxd*|twed*|vn*|wd*|wfd*)
 	[0-9]|[0-9][0-9]|[0-4][0-9][0-9]|50[0-9]|51[0-1])
 		for slicepartname in s0h s1 s2 s3 s4
 		do
-			sh MAKEDEV $name$unit$slicepartname
+			sh $0 $name$unit$slicepartname
 		done
 		if [ "x$name" = "xvn" ] ; then
 			# We need to control device so we can configure
@@ -1719,7 +1719,7 @@ tw*)
 
 local)
 	umask 0			# XXX should be elsewhere
-	sh MAKEDEV.local
+	sh $0.local
 	umask 77
 	;;