small install script fixes

3 files changed, 18 insertions, 12 deletions

diff --git a/distrib/pmax/install.md b/distrib/pmax/install.md
index 1e91033bbb8..37139914cfd 100644
--- a/distrib/pmax/install.md
+++ b/distrib/pmax/install.md
@@ -1,4 +1,4 @@
-#	$OpenBSD: install.md,v 1.3 1997/05/14 21:39:18 millert Exp $
+#	$OpenBSD: install.md,v 1.4 1997/05/15 12:31:11 graichen Exp $
 #	$NetBSD: install.md,v 1.3.2.5 1996/08/26 15:45:28 gwr Exp $
 #
 #
@@ -87,6 +87,10 @@ md_mountkernfs() {
 	if [ ! -d /kern ]; then
 		mkdir /kern
 	fi
+# TTT use the chance to also make the /mnt2 directory - should be there
+	if [ ! -d /mnt2 ]; then
+		mkdir /mnt2
+	fi
         if ! mount -t kernfs /kern /kern
         then
                 cat << \__kernfs_failed_1
diff --git a/distrib/simpleroot/install.sh b/distrib/simpleroot/install.sh
index b8f3fbff450..f6e3136ad55 100644
--- a/distrib/simpleroot/install.sh
+++ b/distrib/simpleroot/install.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-#	$OpenBSD: install.sh,v 1.2 1997/05/13 14:29:38 graichen Exp $
+#	$OpenBSD: install.sh,v 1.3 1997/05/15 12:31:15 graichen Exp $
 #	$NetBSD: install.sh,v 1.5.2.8 1996/08/27 18:15:05 gwr Exp $
 #
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@ MODE="install"
 #	md_makerootwritable()	- make root writable (at least /tmp)
 
 # test if / is read write
-echo "" > /tmp/test_read_write_root
+echo "" > /tmp/test_read_write_root 2> /dev/null
 if [ "X$?" != X"0" ]; then
 	echo "Please mount your rootfilesystem read/write - for"
 	echo "instance - if the disk you booted from is rz0 do"
@@ -298,9 +298,6 @@ getresp "y"
 case "$resp" in
 	y*|Y*)
 		resp=""		# force at least one iteration
-		if [ -f /etc/myname ]; then
-			resp=`cat /etc/myname`
-		fi
 		while [ "X${resp}" = X"" ]; do
 			echo -n "Enter system hostname: [$resp] "
 			getresp "$resp"
@@ -479,9 +476,9 @@ for file in fstab hostname.* hosts myname mygate resolv.conf; do
 done
 
 # If no zoneinfo on the installfs, give them a second chance
-if [ ! -e /usr/share/zoneinfo ]; then
+# TTT if [ ! -e /usr/share/zoneinfo ]; then
 	get_timezone
-fi
+# TTT fi
 if [ ! -e /mnt/usr/share/zoneinfo ]; then
 	echo "Cannot install timezone link..."
 else
@@ -509,7 +506,11 @@ if [ "X${SIMPLEROOT}" != X"simpleroot" ]; then
 	echo "done."
 	cd /
 else
-	echo -n "did you install the comp${VERSION} set ? [y] "
+	echo ""
+	echo "Removing files from the simpleroot which do not belong"
+	echo "to the installed sets."
+	echo ""
+	echo -n "Did you install the comp${VERSION} set ? [y] "
 	getresp "n"
 	case "$resp" in
 		n*|N*)
@@ -518,7 +519,7 @@ else
 		*)
 			;;
 	esac
-	echo -n "did you install the game${VERSION} set ? [y] "
+	echo -n "Did you install the game${VERSION} set ? [y] "
 	getresp "n"
 	case "$resp" in
 		n*|N*)
@@ -531,6 +532,7 @@ fi
 
 umount /kern
 rmdir /kern
+rmdir /mnt2
 
 unmount_fs /tmp/fstab.shadow
 
diff --git a/distrib/simpleroot/install.sub b/distrib/simpleroot/install.sub
index 7d7634cfcb3..3235a8da387 100644
--- a/distrib/simpleroot/install.sub
+++ b/distrib/simpleroot/install.sub
@@ -1,5 +1,5 @@
 #!/bin/sh
-#	$OpenBSD: install.sub,v 1.3 1997/05/14 07:58:55 graichen Exp $
+#	$OpenBSD: install.sub,v 1.4 1997/05/15 12:31:15 graichen Exp $
 #	$NetBSD: install.sub,v 1.5.2.8 1996/09/02 23:25:02 pk Exp $
 #
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -1155,7 +1155,7 @@ get_timezone() {
 	# If the zoneinfo is not on the installation medium or on the
 	# installed filesystem, set TZ to GMT and return immediatly.
 	#
-	if [ ! -e /usr/share/zoneinfo -a ! -e /mnt/usr/share/zoneinfo ]; then
+	if [ ! -e /usr/share/zoneinfo -o ! -e /mnt/usr/share/zoneinfo ]; then
 		TZ=GMT
 		return
 	fi