mount kerfs and fix TERM=sun vs pc3 confusion

5 files changed, 22 insertions, 14 deletions

diff --git a/distrib/sparc/floppies/inst/dot.hdprofile b/distrib/sparc/floppies/inst/dot.hdprofile
index 853cbcbf93a..6c2d4debaf0 100644
--- a/distrib/sparc/floppies/inst/dot.hdprofile
+++ b/distrib/sparc/floppies/inst/dot.hdprofile
@@ -1,4 +1,4 @@
-#	$OpenBSD: dot.hdprofile,v 1.3 1996/10/18 23:35:12 deraadt Exp $
+#	$OpenBSD: dot.hdprofile,v 1.4 1997/05/01 18:46:52 grr Exp $
 #
 # Copyright (c) 1994 Christopher G. Demetriou
 # All rights reserved.
@@ -30,7 +30,7 @@
 
 PATH=/sbin:/bin:/usr/bin:/usr/sbin:/
 export PATH
-TERM=pc3
+TERM=sun
 export TERM
 
 umask 022
diff --git a/distrib/sparc/floppies/inst/dot.profile b/distrib/sparc/floppies/inst/dot.profile
index d97b0fd8a4c..ebec7371d23 100644
--- a/distrib/sparc/floppies/inst/dot.profile
+++ b/distrib/sparc/floppies/inst/dot.profile
@@ -1,4 +1,4 @@
-#       $OpenBSD: dot.profile,v 1.3 1997/05/01 11:30:49 niklas Exp $
+#       $OpenBSD: dot.profile,v 1.4 1997/05/01 18:46:54 grr Exp $
 #
 # Copyright (c) 1994 Christopher G. Demetriou
 # All rights reserved.
@@ -31,7 +31,7 @@
 
 PATH=/sbin:/bin:/usr/bin:/usr/sbin:/
 export PATH
-TERM=pc3
+TERM=sun
 export TERM
 
 umask 022
@@ -48,6 +48,9 @@ if [ "X${DONEPROFILE}" = "X" ]; then
 	. /.commonutils
 	. /.instutils
 
+	# mount /kern so install can peek at msgbuf
+	mount -t kernfs /kern /kern
+
 	# run the installation script.
 	install
 fi
diff --git a/distrib/sparc/floppies/inst/install.sh b/distrib/sparc/floppies/inst/install.sh
index 0a8176e09e1..04490191c7b 100644
--- a/distrib/sparc/floppies/inst/install.sh
+++ b/distrib/sparc/floppies/inst/install.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-#	$OpenBSD: install.sh,v 1.8 1997/05/01 11:27:12 niklas Exp $
+#	$OpenBSD: install.sh,v 1.9 1997/05/01 18:46:56 grr Exp $
 #
 # Copyright (c) 1994 Christopher G. Demetriou
 # All rights reserved.
@@ -35,6 +35,7 @@
 
 DT=/etc/disktab				# /etc/disktab
 FSTABDIR=/mnt/etc			# /mnt/etc
+MSGBUF=/kern/msgbuf			# message buffer vs. dmesg
 #DONTDOIT=echo
 
 VERSION=2.0
@@ -136,7 +137,7 @@ echo -n "View the boot messages again? [n] "
 getresp "n"
 case "$resp" in
 y*|Y*)
-	less -rsS /kern/msgbuf
+	less -rsS $MSGBUF
 	;;
 *)
 	echo	""
@@ -152,11 +153,11 @@ args ()
 	eval echo \$$1
 }
 
-bytes_pser_sect=`cat /kern/msgbuf | sed -n -e /^${drivename}:/p -e /^${drivename}:/q`
+bytes_pser_sect=`cat $MSGBUF | sed -n -e /^${drivename}:/p -e /^${drivename}:/q`
 bytes_pser_sect=`args 10 $bytes_pser_sect `
 
 echo here
-bytes_per_sect=`cat /kern/msgbuf | sed -n -e /^${drivename}:/p -e /^${drivename}:/q`
+bytes_per_sect=`cat $MSGBUF | sed -n -e /^${drivename}:/p -e /^${drivename}:/q`
 echo no here
 bytes_per_sect=`args 10 $bytes_per_sect`
 
@@ -164,21 +165,21 @@ echo -n "Number of bytes per disk sector? [$bytes_per_sect] "
 getresp $bytes_per_sect
 bytes_per_sect="$resp"
 
-cyls_per_disk=`cat /kern/msgbuf | sed -n -e /^${drivename}:/p -e /^${drivename}:/q`
+cyls_per_disk=`cat $MSGBUF | sed -n -e /^${drivename}:/p -e /^${drivename}:/q`
 cyls_per_disk=`args 4 $cyls_per_disk`
 
 echo -n "Number of disk cylinders? [$cyls_per_disk]"
 getresp $cyls_per_disk
 cyls_per_disk="$resp"
 
-tracks_per_cyl=`cat /kern/msgbuf | sed -n -e /^${drivename}:/p -e /^${drivename}:/q`
+tracks_per_cyl=`cat $MSGBUF | sed -n -e /^${drivename}:/p -e /^${drivename}:/q`
 tracks_per_cyl=`args 6 $tracks_per_cyl`
 
 echo -n "Number of disk tracks (heads) per disk cylinder? [$tracks_per_cyl]"
 getresp $tracks_per_cyl
 tracks_per_cyl="$resp"
 
-sects_per_track=`sed -n -e /^${drivename}:/p -e /^${drivename}:/q /kern/msgbuf`
+sects_per_track=`sed -n -e /^${drivename}:/p -e /^${drivename}:/q $MSGBUF`
 sects_per_track=`args 8 $sects_per_track`
 
 echo -n "Number of disk sectors per disk track? [$sects_per_track]"
diff --git a/distrib/sparc/floppies/inst/list b/distrib/sparc/floppies/inst/list
index 14a51aceac4..79f323a5606 100644
--- a/distrib/sparc/floppies/inst/list
+++ b/distrib/sparc/floppies/inst/list
@@ -1,4 +1,4 @@
-#	$OpenBSD: list,v 1.3 1997/05/01 11:30:50 niklas Exp $
+#	$OpenBSD: list,v 1.4 1997/05/01 18:46:57 grr Exp $
 
 # the disktab explanation file
 COPY	disktab.preinstall		etc/disktab.preinstall
@@ -12,4 +12,8 @@ COPY	install.sh			install
 # we need the contents of /usr/mdec
 COPYDIR	${DESTDIR}/usr/mdec	usr/mdec
 
+# and a mount point for the kernfs
+SPECIAL	mkdir kern
+
+# make install executable
 SPECIAL	chmod 755 install
diff --git a/distrib/sparc/floppies/upgr/dot.hdprofile b/distrib/sparc/floppies/upgr/dot.hdprofile
index 2f2d2d342c8..14520116ab9 100644
--- a/distrib/sparc/floppies/upgr/dot.hdprofile
+++ b/distrib/sparc/floppies/upgr/dot.hdprofile
@@ -1,4 +1,4 @@
-#	$OpenBSD: dot.hdprofile,v 1.3 1997/05/01 11:30:58 niklas Exp $
+#	$OpenBSD: dot.hdprofile,v 1.4 1997/05/01 18:46:59 grr Exp $
 #
 # Copyright (c) 1994 Christopher G. Demetriou
 # All rights reserved.
@@ -30,7 +30,7 @@
 
 PATH=/sbin:/bin:/usr/bin:/usr/sbin:/
 export PATH
-TERM=pc3
+TERM=sun
 export TERM
 
 umask 022