Merge the netbsd-1-2 branch back into the mainline.

distrib/miniroot/Makefile

@@ -1,7 +1,7 @@
-#	$NetBSD: Makefile,v 1.8 1996/07/04 06:53:12 leo Exp $
+#	$NetBSD: Makefile,v 1.9 1996/10/10 19:58:32 gwr Exp $
 
-# Revision is 1.2A
-REV=		12A
+# Revision is 1.2
+REV=		12
 
 CBIN=		instbin
 ARCHDIR=	${.CURDIR}/../${MACHINE}/miniroot

distrib/miniroot/install.sh

@@ -1,5 +1,5 @@
 #!/bin/sh
-#	$NetBSD: install.sh,v 1.13 1996/08/26 02:34:42 thorpej Exp $
+#	$NetBSD: install.sh,v 1.14 1996/10/10 19:58:33 gwr Exp $
 #
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -62,6 +62,7 @@ MODE="install"
 #	md_congrats()		- display friendly message
 #	md_native_fstype()	- native filesystem type for disk installs
 #	md_native_fsopts()	- native filesystem options for disk installs
+#	md_makerootwritable()	- make root writable (at least /tmp)
 
 # include machine dependent subroutines
 . install.md
@@ -69,6 +70,9 @@ MODE="install"
 # include common subroutines
 . install.sub
 
+# which sets?
+THESETS="$ALLSETS"
+
 # Good {morning,afternoon,evening,night}.
 md_welcome_banner
 echo -n "Proceed with installation? [n] "
@@ -92,8 +96,10 @@ md_set_term
 # Get timezone info
 get_timezone
 
-# We don't like it, but it sure makes a few things a lot easier.
-do_mfs_mount "/tmp" "2048"
+# Make sure we can write files (at least in /tmp)
+# This might make an MFS mount on /tmp, or it may
+# just re-mount the root with read-write enabled.
+md_makerootwritable
 
 # Install the shadowed disktab file; lets us write to it for temporary
 # purposes without mounting the miniroot read-write.

distrib/miniroot/install.sub

@@ -1,5 +1,5 @@
 #!/bin/sh
-#	$NetBSD: install.sub,v 1.14 1996/07/04 06:57:21 leo Exp $
+#	$NetBSD: install.sub,v 1.15 1996/10/10 19:58:34 gwr Exp $
 #
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -175,24 +175,6 @@ twiddle() {
 	done > /dev/tty & echo $!
 }
 
-do_mfs_mount() {
-	# $1 is the mount point
-	# $2 is the size in DEV_BIZE blocks
-
-	umount $1 > /dev/null 2>&1
-	if ! mount_mfs -s $2 swap $1 ; then
-		cat << \__mfs_failed_1
-
-FATAL ERROR: Can't mount the memory filesystem.
-
-__mfs_failed_1
-		exit
-	fi
-
-	# Bleh.  Give mount_mfs a chance to DTRT.
-	sleep 2
-}
-
 get_localdir() {
 	# $1 is relative mountpoint
 	local _mp
@@ -314,9 +296,10 @@ addifconfig() {
 	# $2 - interface symbolic name
 	# $3 - interface IP address
 	# $4 - interface netmask
+	# $5 - (optional) interface link-layer directives
 
 	# Create a hostname.* file for the interface.
-	echo "inet $2 $4" > /tmp/hostname.$1
+	echo "inet $2 $4 NONE $5" > /tmp/hostname.$1
 
 	addhostent $3 $2
 }
@@ -371,6 +354,7 @@ configure_ifs() {
 	local _interface_ip
 	local _interface_mask
 	local _interface_symname
+	local _interface_extra
 
 	_interface_name=$1
 
@@ -411,6 +395,16 @@ configure_ifs() {
 		_interface_mask=$resp
 	done
 
+	echo "Your network interface might require additional link-layer"
+	echo "directives (like \`link0'). If this is the case you can enter"
+	echo "these at the next prompt."
+	echo ""
+	echo -n "Additional link-layer arguments? [$_interface_extra] "
+	getresp "$_interface_extra"
+	if [ "X${resp}" != X"" ]; then
+		_interface_extra=$resp
+	fi
+
 	# Configure the interface.  If it
 	# succeeds, add it to the permanent
 	# network configuration info.
@@ -418,12 +412,12 @@ configure_ifs() {
 		ifconfig ${_interface_name} down
 		if ifconfig ${_interface_name} inet \
 		    ${_interface_ip} \
-		    netmask ${_interface_mask} up ; then
+		    netmask ${_interface_mask} ${_interface_extra} up ; then
 			addifconfig \
 			    ${_interface_name} \
 			    ${_interface_symname} \
 			    ${_interface_ip} \
-			    ${_interface_mask}
+			    ${_interface_mask} ${_interface_extra}
 			return 0
 		fi
 	else
@@ -433,7 +427,7 @@ configure_ifs() {
 		    ${_interface_name} \
 		    ${_interface_symname} \
 		    ${_interface_ip} \
-		    ${_interface_mask}
+		    ${_interface_mask} ${_interface_extra}
 	fi
 	return 1
 }