update from netbsd

6 files changed, 36 insertions, 7 deletions

diff --git a/distrib/i386/floppies/inst-common/instbin.conf b/distrib/i386/floppies/inst-common/instbin.conf
index cbf54595c0a..cdda94ccd5e 100644
--- a/distrib/i386/floppies/inst-common/instbin.conf
+++ b/distrib/i386/floppies/inst-common/instbin.conf
@@ -1,13 +1,14 @@
 #
 # kcbin.conf - unified binary for the kc floppy
-# $Id: instbin.conf,v 1.1 1995/10/18 08:37:34 deraadt Exp $	
+# $Id: instbin.conf,v 1.2 1995/11/23 15:58:00 deraadt Exp $	
 #
 
 srcdirs bin sbin usr.bin usr.sbin gnu/usr.bin
 
 progs bad144 cat chmod chown chroot cp dd df disklabel ed expr fsck ftp gawk
 progs gzip ifconfig init ln ls mkdir mknod more mount mount_cd9660
-progs mount_ffs mount_msdos mount_nfs mv newfs ping pwd reboot rm route
+progs mount_ffs mount_msdos mount_nfs mount_kernfs
+progs mv newfs ping pwd reboot rm route
 progs sed sh shutdown slattach strings stty sync tar test tip umount
 progs update
 
@@ -20,6 +21,7 @@ ln mount_cd9660 cd9660
 ln mount_ffs ffs
 ln mount_msdos msdos
 ln mount_nfs nfs
+ln mount_kernfs kernfs
 ln reboot halt
 
 libs -ledit -lutil -ltermcap -lcrypt -ll -lm
diff --git a/distrib/i386/floppies/inst-common/list b/distrib/i386/floppies/inst-common/list
index 9c4c36d3036..b842a11a07b 100644
--- a/distrib/i386/floppies/inst-common/list
+++ b/distrib/i386/floppies/inst-common/list
@@ -1,4 +1,4 @@
-#	$Id: list,v 1.1 1995/10/18 08:37:34 deraadt Exp $
+#	$Id: list,v 1.2 1995/11/23 15:58:01 deraadt Exp $
 
 # copy the crunched binary, link to it, and kill it
 COPY	${OBJDIR}/instbin	instbin
@@ -31,6 +31,7 @@ LINK	instbin			sbin/mount_cd9660
 LINK	instbin			sbin/mount_ffs
 LINK	instbin			sbin/mount_msdos
 LINK	instbin			sbin/mount_nfs
+LINK	instbin			sbin/mount_kernfs
 LINK	instbin			sbin/newfs
 LINK	instbin			sbin/ping
 LINK	instbin			sbin/reboot
diff --git a/distrib/i386/floppies/inst-common/mtree.conf b/distrib/i386/floppies/inst-common/mtree.conf
index fa0159e1867..1fdf6e4ce86 100644
--- a/distrib/i386/floppies/inst-common/mtree.conf
+++ b/distrib/i386/floppies/inst-common/mtree.conf
@@ -1,4 +1,4 @@
-#	$Id: mtree.conf,v 1.1 1995/10/18 08:37:34 deraadt Exp $
+#	$Id: mtree.conf,v 1.2 1995/11/23 15:58:02 deraadt Exp $
 
 /set type=dir uname=root gname=wheel mode=0755
 # .
@@ -29,6 +29,11 @@ mnt2
 # ./mnt2
 ..
 
+# ./kern
+kern
+# ./kern
+..
+
 # ./sbin
 sbin
 # ./sbin
diff --git a/distrib/i386/floppies/inst/dot.hdprofile b/distrib/i386/floppies/inst/dot.hdprofile
index 9dd28c2316d..3bb1bee7907 100644
--- a/distrib/i386/floppies/inst/dot.hdprofile
+++ b/distrib/i386/floppies/inst/dot.hdprofile
@@ -27,7 +27,7 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-#       $Id: dot.hdprofile,v 1.1 1995/10/18 08:37:34 deraadt Exp $
+#       $Id: dot.hdprofile,v 1.2 1995/11/23 15:57:57 deraadt Exp $
 
 PATH=/sbin:/bin:/usr/bin:/usr/sbin:/
 export PATH
@@ -44,6 +44,7 @@ if [ "X${DONEPROFILE}" = "X" ]; then
 
 	echo "Mounting filesystems..."
 	mount -a
+	mount -t kernfs /kern /kern
 
 	# set up some sane defaults
 	echo 'erase ^?, werase ^W, kill ^U, intr ^C'
diff --git a/distrib/i386/floppies/inst/dot.profile b/distrib/i386/floppies/inst/dot.profile
index d7df5e5dfbf..ff168b23cd8 100644
--- a/distrib/i386/floppies/inst/dot.profile
+++ b/distrib/i386/floppies/inst/dot.profile
@@ -27,7 +27,7 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-#       $Id: dot.profile,v 1.1 1995/10/18 08:37:34 deraadt Exp $
+#       $Id: dot.profile,v 1.2 1995/11/23 15:57:58 deraadt Exp $
 
 PATH=/sbin:/bin:/usr/bin:/usr/sbin:/
 export PATH
@@ -47,6 +47,9 @@ if [ "X${DONEPROFILE}" = "X" ]; then
 	# run update, so that installed software is written as it goes.
 	update
 
+	# mount the kern_fs so that we can examine the dmesg state
+	mount -t kernfs /kern /kern
+
 	# pull in the functions that people will use from the shell prompt.
 	. /.commonutils
 	. /.instutils
diff --git a/distrib/i386/floppies/inst/install.sh b/distrib/i386/floppies/inst/install.sh
index 828e4aa9504..d82f84f21e4 100644
--- a/distrib/i386/floppies/inst/install.sh
+++ b/distrib/i386/floppies/inst/install.sh
@@ -28,7 +28,7 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-#	$Id: install.sh,v 1.2 1995/11/06 21:27:35 deraadt Exp $
+#	$Id: install.sh,v 1.3 1995/11/23 15:57:59 deraadt Exp $
 
 #	NetBSD installation script.
 #	In a perfect world, this would be a nice C program, with a reasonable
@@ -162,6 +162,23 @@ echo	"geometry.  This should either be in the User's Manual for your disk,"
 echo	"or you should have written down what NetBSD printed when booting."
 echo	"(Note that he geometry that's printed at boot time is preferred.)"
 echo	""
+echo    "You may choose to view the initial boot messages for your system"
+echo    "again right now if you like."
+echo -n "View the boot messages again? [n] "
+getresp "n"
+case "$resp" in
+	y*|Y*)
+		more /kern/msgbuf
+		;;
+	*)
+		echo	""
+		;;
+esac
+
+echo	""
+echo	"You will now enter the disk geometry information"
+echo	""
+
 echo -n	"Number of bytes per disk sector? [512] "
 getresp 512
 bytes_per_sect="$resp"