 @@ -1,15 +1,15 @@
 #!/bin/sh -
-#	$NetBSD: MAKEDEV.tmpl,v 1.118 2008/11/28 16:04:31 joerg Exp $
+#	$NetBSD: MAKEDEV.tmpl,v 1.119 2009/01/03 08:49:03 apb Exp $
+#
 # Copyright (c) 2003,2007,2008 The NetBSD Foundation, Inc.
 # All rights reserved.
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 # 1. Redistributions of source code must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
+#
 @@ -277,32 +277,39 @@
 #	twa	3ware Apache control interface
 #	twe	3ware Escalade control interface
 #	uk*	unknown SCSI device
 #	veriexec verified executable fingerprint loader
 #	video*	video capture devices
 #	view*	generic interface to graphic displays (Amiga)
 #	vmegen*	generic VME access
 #	wsfont*	console font control
 #	wsmux*	wscons event multiplexor
 #	xenevt	Xen event interface
+#
-# Apart from a few lines right at the end, this file should consist
+# NOTE:
 # entirely of function definitions.
+#
-# This file is used both as a standalone script (via "sh ./MAKEDEV all"
+# * MAKEDEV is used both as a standalone script (via "sh ./MAKEDEV
-# or similar), and as a function library (via "MAKEDEV_AS_LIBRARY=1 .
+#   all" or similar), and as a function library for MAKEDEV.local (via
-# MAKEDEV" from MAKEDEV.local).
+#   "MAKEDEV_AS_LIBRARY=1 . MAKEDEV").  Because of this, the script
 #   should consist almost entirely of function definitions, apart from a
 #   few lines right at the end.
+#
 # * MAKEDEV may be executed in an environment that is missing some
 #   common commands.  For example, it may be executed from a minimal
 #   system used during installation, or it may be executed early in the
 #   boot sequence before most file systems have been mounted.  It may
 #   also be executed in a cross-build environment on a non-NetBSD host.
+#
 usage()
+{
 	cat 1>&2 << _USAGE_
 Usage: ${0##*/} [-fMs] [-m mknod] [-p pax] [-t mtree] special [...]
 	Create listed special devices.  Options:
 	-f		Force permissions to be updated on existing devices.
 	-M		Create memory file system.
 	-m mknod	Name of mknod(8) program.  [\$TOOL_MKNOD or mknod]
 	-p pax  	Name of pax(1) program.  [\$TOOL_PAX or pax]
 	-s		Generate mtree(8) specfile instead of creating devices.
 	-t mtree	Name of mtree(8) program.  [\$TOOL_MTREE or mtree]
 @@ -466,34 +473,52 @@ setup()
 	u_root="%uid_root%"
 	u_uucp="%uid_uucp%"
 	g_kmem="%gid_kmem%"
 	g_ntpd="%gid_ntpd%"
 	g_operator="%gid_operator%"
 	g_wheel="%gid_wheel%"
 	dialin=0
 	dialout=524288
 	callunit=262144
 	# only allow read&write for owner by default
 	umask 077
-	# Check if we have fdesc mounted
+	# Set fdesc_mounted=true if the fdesc file system is mounted
 	# on the current directory (typically "/dev").
 	# Later, this will be used to suppress creation of device nodes
 	# that are supplied by the fdesc file system.
+	#
 	fdesc_mounted=false
 	if [ -d fd ]; then
-		case "$(df fd)" in
+		# Parse the output from "mount -u -o nosuchoption .".
-		*fdesc*)	nofdesc=false;;
+		# We don't parse the output from df(1) because that's
-		*)		nofdesc=true;;
+		# less likely to be available on install media.
+		#
 		# If the current directory is a mount point for the
 		# fdesc file system, then the expected output (whether
 		# or not the current user is root) is:
 		#	mount_fdesc: -o suchoption: option not supported.
+		#
 		# If the current directory is not a mount point, then
 		# the expected output is:
 		#	mount: .: unknown special file or file system.
+		#
 		# If we are not running on NetBSD, or mount(8) is not
 		# found, then we should get some other error message.
+		#
 		case "$({ LC_ALL=C mount -u -o nosuchoption . ; } 2>&1)" in
 		*mount_fdesc*)	fdesc_mounted=true ;;
 		esac
 	else
 		nofdesc=true
 	fi
 	# do_force requires mknod
 	if $do_force; then
 		if $do_mtree || $do_pax || $do_specfile; then
 			die "-f option works only with mknod"
 		fi
 		do_mknod=true
 	fi
 	# If no explicit method was specified on the command line or
 	# forced above, then use one of mtree, pax, or mknod, in that
 	# order of preference.
 @@ -772,27 +797,27 @@ isdns)
 	makedev isdn isdnctl isdnbchan0 isdnbchan1 isdntel0 isdntel1 isdnteld0 isdnteld1 isdntrc0 isdntrc1
 	;;
 std)
 	mkdev		console c %cons_chr% 0	600
 	mkdev		constty c %cons_chr% 1	600
 	mkdev		drum	c %swap_chr% 0	640 $g_kmem
 	mkdev		kmem	c %mem_chr% 1	640 $g_kmem
 	mkdev		mem	c %mem_chr% 0	640 $g_kmem
 	mkdev		null	c %mem_chr% 2	666
 	mkdev		zero	c %mem_chr% 12	666
 	mkdev		klog	c %log_chr% 0	600
 	mkdev		ksyms	c %ksyms_chr% 0 444
-	if $nofdesc; then
+	if ! $fdesc_mounted; then
 		mkdev	tty	c %ctty_chr% 0		666
 		mkdev	stdin	c %filedesc_chr% 0	666
 		mkdev	stdout	c %filedesc_chr% 1	666
 		mkdev	stderr	c %filedesc_chr% 2	666
 	fi
 	;;
 usb)
 	mkdev usb c %usb_chr% 255 444
 	;;
 usb*)
 	unit=${i#usb}
 @@ -898,27 +923,27 @@ ttyE*)
 	;;
 wsmouse*)
 	unit=${i#wsmouse}
 	mkdev wsmouse$unit c %wsmouse_chr% $unit
 	;;
 wskbd*)
 	unit=${i#wskbd}
 	mkdev wskbd$unit c %wskbd_chr% $unit
 	;;
 fd)
-	if $nofdesc; then
+	if ! $fdesc_mounted; then
 		makedir fd 755
 		n=0
 		while [ $n -lt 64 ]
 		do
 			mkdev fd/$n c %filedesc_chr% $n 666
 			n=$(($n + 1))
 		done
 	fi
 	;;
 wt*)
 	case $i in
 	wt*) name=wt;  unit=${i#wt};	chr=%wt_chr%;	blk=%wt_blk%;;