use one common dot.profile for all

4 files changed, 2 insertions, 172 deletions

diff --git a/distrib/sun3/miniroot/dot.profile b/distrib/sun3/miniroot/dot.profile
deleted file mode 100644
index afecb7fe764..00000000000
--- a/distrib/sun3/miniroot/dot.profile
+++ /dev/null
@@ -1,88 +0,0 @@
-#	$OpenBSD: dot.profile,v 1.10 2002/04/13 17:36:56 deraadt 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=sun
-
-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 9600
-
-	# 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/sun3/miniroot/list b/distrib/sun3/miniroot/list
index 0e6191c7a21..9f05b5bd10b 100644
--- a/distrib/sun3/miniroot/list
+++ b/distrib/sun3/miniroot/list
@@ -1,4 +1,4 @@
-#	$OpenBSD: list,v 1.5 2002/04/21 17:13:35 deraadt Exp $
+#	$OpenBSD: list,v 1.6 2002/04/22 02:43:16 deraadt Exp $
 
 # Sun3 extras
 LINK	instbin			sbin/disklabel
@@ -42,7 +42,6 @@ SYMLINK	/tmp/resolv.conf.shadow		etc/resolv.conf
 SYMLINK	/tmp/hosts			etc/hosts
 
 # and the installation tools
-SPECIAL sed -e '/^[ 	]*#[ 	].*$/d' -e '/^[ 	]*#$/d' < ${ARCHDIR}/dot.profile	 > .profile
 SPECIAL sed -e '/^#[ 	].*$/d' -e "s/^ARCH=ARCH$/ARCH=`arch -ks`" < ${CURDIR}/../common/install.md	 > install.md
 
 SPECIAL sync; ${DESTDIR}/usr/mdec/installboot ${TARGDIR}/boot ${DESTDIR}/usr/mdec/bootxx /dev/rsvnd0c
diff --git a/distrib/sun3/ramdisk/dot.profile b/distrib/sun3/ramdisk/dot.profile
deleted file mode 100644
index ea3c356d0f2..00000000000
--- a/distrib/sun3/ramdisk/dot.profile
+++ /dev/null
@@ -1,80 +0,0 @@
-#	$OpenBSD: dot.profile,v 1.8 2002/04/01 01:31:40 deraadt 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=sun
-
-if [ "X${DONEPROFILE}" = "X" ]; then
-	DONEPROFILE=YES
-
-	mount -u /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 9600
-
-	# 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/sun3/ramdisk/list b/distrib/sun3/ramdisk/list
index 41a7ac7f1f3..85bf7e83554 100644
--- a/distrib/sun3/ramdisk/list
+++ b/distrib/sun3/ramdisk/list
@@ -1,4 +1,4 @@
-#	$OpenBSD: list,v 1.7 2002/04/21 17:13:35 deraadt Exp $
+#	$OpenBSD: list,v 1.8 2002/04/22 02:43:16 deraadt Exp $
 
 # Sun3 extra's
 LINK	instbin			sbin/disklabel
@@ -32,5 +32,4 @@ SYMLINK	/tmp/resolv.conf.shadow		etc/resolv.conf
 SYMLINK	/tmp/hosts			etc/hosts
 
 # and the installation tools
-SPECIAL sed -e '/^[ 	]*#[ 	].*$/d' -e '/^[ 	]*#$/d' < ${ARCHDIR}/../ramdisk/dot.profile	 > .profile
 SPECIAL sed -e '/^#[ 	].*$/d' -e "s/^ARCH=ARCH$/ARCH=`arch -ks`/" < ${CURDIR}/../common/install.md	 > install.md