use one common dot.profile for all

4 files changed, 8 insertions, 151 deletions

diff --git a/distrib/mvme88k/miniroot/dot.profile b/distrib/mvme88k/miniroot/dot.profile
deleted file mode 100644
index d9edf752790..00000000000
--- a/distrib/mvme88k/miniroot/dot.profile
+++ /dev/null
@@ -1,89 +0,0 @@
-#	$OpenBSD: dot.profile,v 1.12 2002/04/13 17:36:56 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.
-# 
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-# 3. All advertising materials mentioning features or use of this software
-#    must display the following acknowledgement:
-#	This product includes software developed by Christopher G. Demetriou.
-# 4. The name of the author may not be used to endorse or promote products
-#    derived from this software without specific prior written permission
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-
-export PATH=/sbin:/bin:/usr/bin:/usr/sbin:/
-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
-# terminals believed to be in termcap, default TERM
-TERMS="sun vt* pcvt* dumb"
-TERM=vt220
-
-rootdisk=`dmesg|sed -n -e '/OpenBSD /h' -e '//!H' -e '${
-	g
-	p
-}'|sed -n -e '/^root on \([0-9a-z]*\).*/{
-	s//\/dev\/\1/
-	p
-}'`
-
-if [ "X${DONEPROFILE}" = "X" ]; then
-	DONEPROFILE=YES
-
-	mount -u ${rootdisk:-/dev/rd0a} /
-
-	# set up some sane defaults
-	echo 'erase ^?, werase ^W, kill ^U, intr ^C, status ^T'
-	stty newcrt werase ^W intr ^C kill ^U erase ^? status ^T
-
-	# get the terminal type
-	_forceloop=""
-	while [ "X$_forceloop" = X"" ]; do
-		echo "Supported terminals are: $TERMS"
-		eval `tset -s -m ":?$TERM"`
-		if [ "X$TERM" != X"unknown" ]; then
-			_forceloop="done"
-		fi
-	done
-	export TERM
-
-	# Installing or upgrading?
-	_forceloop=""
-	while [ "X$_forceloop" = X"" ]; do
-		echo -n '(I)nstall, (U)pgrade, or (S)hell? '
-		read _forceloop
-		case "$_forceloop" in
-		i*|I*)	/install
-			;;
-		u*|U*)	/upgrade
-			;;
-		s*|S*)	;;
-		*)	_forceloop=""
-			;;
-		esac
-	done
-fi
diff --git a/distrib/mvme88k/miniroot/list b/distrib/mvme88k/miniroot/list
index 5278d7df380..3478ac1332a 100644
--- a/distrib/mvme88k/miniroot/list
+++ b/distrib/mvme88k/miniroot/list
@@ -1,4 +1,4 @@
-#	$OpenBSD: list,v 1.7 2002/04/21 17:14:17 deraadt Exp $
+#	$OpenBSD: list,v 1.8 2002/04/22 02:43:16 deraadt Exp $
 #	$NetBSD: list,v 1.2.4.2 1996/06/26 19:25:00 pk Exp $
 
 # Amiga extra's
@@ -32,5 +32,4 @@ SYMLINK	/tmp/resolv.conf.shadow		etc/resolv.conf
 SYMLINK	/tmp/hosts			etc/hosts
 
 # and the installation tools
-COPY	${ARCHDIR}/dot.profile		.profile
 SPECIAL sed -e '/^[ 	]*#[ 	].*$/d' -e '/^[ 	]*#$/d' -e "s/^ARCH=ARCH$/ARCH=`arch -ks`" < ${ARCHDIR}/../install.md > install.md
diff --git a/distrib/mvme88k/ramdisk/dot.profile b/distrib/mvme88k/ramdisk/dot.profile
deleted file mode 100644
index 7e8ebbcf4c7..00000000000
--- a/distrib/mvme88k/ramdisk/dot.profile
+++ /dev/null
@@ -1,53 +0,0 @@
-#
-#	$OpenBSD: dot.profile,v 1.5 2002/04/05 03:13:18 deraadt Exp $
-#
-# Copyright (c) 1994 Christopher G. Demetriou
-# All rights reserved.
-# 
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-# 3. All advertising materials mentioning features or use of this software
-#    must display the following acknowledgement:
-#	This product includes software developed by Christopher G. Demetriou.
-# 4. The name of the author may not be used to endorse or promote products
-#    derived from this software without specific prior written permission
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-
-export PATH=/sbin:/bin:/usr/bin:/usr/sbin:/
-export HISTFILE=/.sh_history
-export TERM=vt200
-
-umask 022
-
-set -o emacs # emacs-style command line editing
-
-# set up some sane defaults
-echo 'erase ^?, werase ^?, kill ^U, intr ^C, status ^T'
-stty newcrt werase ^? intr ^C kill ^U erase ^? status ^T 9600
-echo ''
-
-# pull in the function definitions that people will use from the shell prompt.
-. /.commonutils
-. /.instutils
-
-mount -u /dev/rd0a /
-
-# run the installation script.
-install
diff --git a/distrib/mvme88k/ramdisk/list b/distrib/mvme88k/ramdisk/list
index 79c5147f5c5..f34f322f33b 100644
--- a/distrib/mvme88k/ramdisk/list
+++ b/distrib/mvme88k/ramdisk/list
@@ -1,4 +1,4 @@
-#	$OpenBSD: list,v 1.11 2002/04/21 17:14:17 deraadt Exp $
+#	$OpenBSD: list,v 1.12 2002/04/22 02:43:16 deraadt Exp $
 
 COPY	${OBJDIR}/raminst		raminst
 LINK	raminst			bin/cat
@@ -78,10 +78,10 @@ COPY	${TOPDIR}/common/termcap.vt	usr/share/misc/termcap
 COPY	disktab.preinstall		etc
 
 # and the installation tools
-COPY	dot.profile			.profile
-COPY	install.sh			install
-SPECIAL sed -e '/^[ 	]*#[ 	].*$/d' -e '/^[ 	]*#$/d' -e "s/^ARCH=ARCH$/ARCH=`arch -ks`/" < ${CURDIR}/install.md > install.md
-COPY	install.sub			install.sub
-COPY	disktab.shadow			etc/disktab.shadow
+SPECIAL sed -e '/^[ 	]*#[ 	].*$/d' -e '/^[ 	]*#$/d' < ${CURDIR}/../../miniroot/dot.profile	 > .profile
+SPECIAL sed -e '/^[ 	]*#[ 	].*$/d' -e '/^[ 	]*#$/d' -e "s/^ARCH=ARCH$/ARCH=`arch -ks`/" < ${CURDIR}/install.md	 > install.md
+SPECIAL	sed -e '/^[ 	]*#[ 	].*$/d' -e '/^[ 	]*#$/d' < ${CURDIR}/../../miniroot/upgrade.sh > upgrade
+SPECIAL	sed -e '/^[ 	]*#[ 	].*$/d' -e '/^[ 	]*#$/d' < ${CURDIR}/../../miniroot/install.sh > install
+SPECIAL sed -e '/^[ 	]*#[ 	].*$/d' -e '/^[ 	]*#$/d' -e "/^VERSION=/s/=.*/=${REV}/" < ${CURDIR}/../../miniroot/install.sub > install.sub
+SPECIAL	chmod 755 install upgrade
 
-SPECIAL	chmod 755 install