drop right into install program

2 files changed, 36 insertions, 11 deletions

diff --git a/distrib/i386/floppies/ramdisk/dot.profile b/distrib/i386/floppies/ramdisk/dot.profile
index ef22b27ada6..4626bdc9b1f 100644
--- a/distrib/i386/floppies/ramdisk/dot.profile
+++ b/distrib/i386/floppies/ramdisk/dot.profile
@@ -1,5 +1,7 @@
-#       $OpenBSD: dot.profile,v 1.7 1997/10/20 22:24:08 millert Exp $
+#	$OpenBSD: dot.profile,v 1.8 1998/03/13 20:50:49 deraadt Exp $
+#	$NetBSD: dot.profile,v 1.1 1995/12/18 22:54:43 pk Exp $
 #
+# Copyright (c) 1995 Jason R. Thorpe
 # Copyright (c) 1994 Christopher G. Demetriou
 # All rights reserved.
 # 
@@ -31,25 +33,48 @@
 
 export PATH=/sbin:/bin:/usr/bin:/usr/sbin:/
 export HISTFILE=/.sh_history
-export HOME=/
 
 umask 022
 
 set -o emacs # emacs-style command line editing
 
+# XXX
+# the TERM/EDITOR stuff is really well enough parameterized to be moved
+# into install.sub where it could use the routines there and be invoked
+# from the various (semi) MI install and upgrade scripts
+
+# editors believed to be in $EDITBIN, smart and dumb defaults
+EDITBIN=/bin
+EDITUBIN=/usr/bin
+
 if [ "X${DONEPROFILE}" = "X" ]; then
 	DONEPROFILE=YES
 
+	# mount kernfs and re-mount the boot media (perhaps r/w)
+	mount_kernfs /kern /kern
+	mount_ffs -o update /dev/rd0a /
+
 	# set up some sane defaults
 	echo 'erase ^?, werase ^W, kill ^U, intr ^C'
 	stty newcrt werase ^W intr ^C kill ^U erase ^? 9600
-	echo ''
 
-	mount /dev/rd0a /
+	# Installing or upgrading?
+	_forceloop=""
+	while [ "X$_forceloop" = X"" ]; do
+		echo -n '(I)nstall or (U)pgrade? '
+		read _forceloop
+		case "$_forceloop" in
+			i*|I*)
+				/install
+				;;
 
-	# mount the kern_fs so that we can examine the dmesg state
-	mount -t kernfs /kern /kern
+			u*|U*)
+				/upgrade
+				;;
 
-	echo "Follow the installation directions to install or upgrade"
-	echo "the OpenBSD distribution sets."
+			*)
+				_forceloop=""
+				;;
+		esac
+	done
 fi
diff --git a/distrib/i386/floppies/ramdisk/install.md b/distrib/i386/floppies/ramdisk/install.md
index 0433a6f1e3e..1b1472df8bd 100644
--- a/distrib/i386/floppies/ramdisk/install.md
+++ b/distrib/i386/floppies/ramdisk/install.md
@@ -1,4 +1,4 @@
-#	$OpenBSD: install.md,v 1.28 1998/03/12 08:49:23 deraadt Exp $
+#	$OpenBSD: install.md,v 1.29 1998/03/13 20:50:52 deraadt Exp $
 #
 #
 # Copyright rc) 1996 The NetBSD Foundation, Inc.
@@ -47,8 +47,8 @@ md_set_term() {
 	if [ ! -z "$TERM" ]; then
 		return
 	fi
-	echo -n "Specify terminal type ["$TERM"]: "
-	getresp "$TERM"
+	echo -n "Specify terminal type [pcvt25]: "
+	getresp "pcvt25"
 	TERM="$resp"
 	export TERM
 }