squish it down

4 files changed, 21 insertions, 131 deletions

diff --git a/distrib/sparc/miniroot/dot.profile b/distrib/sparc/dot.profile
index 375928243aa..d2dcd95b1e5 100644
--- a/distrib/sparc/miniroot/dot.profile
+++ b/distrib/sparc/dot.profile
@@ -1,4 +1,4 @@
-#	$OpenBSD: dot.profile,v 1.22 2002/04/13 17:36:56 deraadt Exp $
+#	$OpenBSD: dot.profile,v 1.1 2002/04/21 17:11:27 deraadt Exp $
 #	$NetBSD: dot.profile,v 1.1 1995/12/18 22:54:43 pk Exp $
 #
 # Copyright (c) 1995 Jason R. Thorpe
@@ -35,14 +35,6 @@ 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
@@ -60,17 +52,6 @@ if [ "X${DONEPROFILE}" = "X" ]; then
 	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
diff --git a/distrib/sparc/miniroot/list b/distrib/sparc/miniroot/list
index a3a52ed830c..cb34b7dd050 100644
--- a/distrib/sparc/miniroot/list
+++ b/distrib/sparc/miniroot/list
@@ -1,22 +1,15 @@
-#	$OpenBSD: list,v 1.15 2001/07/03 00:12:07 deraadt Exp $
+#	$OpenBSD: list,v 1.16 2002/04/21 17:11:27 deraadt Exp $
 #	$NetBSD: list,v 1.2.4.2 1996/06/26 19:25:00 pk Exp $
 
 # Sparc extra's
 LINK	instbin			sbin/disklabel
 LINK	instbin			sbin/dhclient
-
-SYMLINK	../../instbin		usr/bin/basename
-SYMLINK ../../instbin		usr/bin/cksum usr/bin/sum
-SYMLINK ../../instbin		usr/bin/cut
-SYMLINK ../../instbin		usr/bin/getopt
-SYMLINK ../../instbin		usr/bin/grep usr/bin/egrep usr/bin/fgrep
-SYMLINK ../../instbin		usr/bin/netstat
-SYMLINK ../../instbin		usr/bin/rsh
-SYMLINK ../../instbin		usr/bin/strings
-SYMLINK ../../instbin		usr/bin/tset usr/bin/reset
-SYMLINK	../../instbin		usr/bin/less usr/bin/more
-SYMLINK	../../instbin		usr/sbin/installboot
-SYMLINK	../../instbin		usr/sbin/sysctl
+LINK	instbin			usr/bin/cksum usr/bin/sum
+LINK	instbin			usr/bin/grep usr/bin/egrep usr/bin/fgrep
+LINK	instbin			usr/bin/tset usr/bin/reset
+LINK	instbin			usr/bin/less usr/bin/more
+LINK	instbin			usr/sbin/installboot
+SPECIAL /bin/rm instbin
 
 SRCDIRS	sys/arch/sparc/stand
 
@@ -27,10 +20,8 @@ SRCDIRS	sys/arch/sparc/stand
 SYMLINK	/tmp	var/tmp
 
 # copy the MAKEDEV script and make some devices
-COPY	${DESTDIR}/dev/MAKEDEV		dev/MAKEDEV
-COPY	${DESTDIR}/dev/MAKEDEV.local	dev/MAKEDEV.local
+SPECIAL	sed -e '/^[ 	]*#[ 	].*$/d' -e '/^[ 	]*#$/d' < ${DESTDIR}/dev/MAKEDEV > dev/MAKEDEV
 SPECIAL	cd dev; sh MAKEDEV all
-#SPECIAL	/bin/rm dev/MAKEDEV
 
 # we need the contents of /usr/mdec
 COPYDIR	${DESTDIR}/usr/mdec	usr/mdec
@@ -50,7 +41,8 @@ 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 "s/^ARCH=ARCH$/ARCH=`arch -s`/" < ${ARCHDIR}/../install.md	 > install.md
+SPECIAL sed -e '/^[ 	]*#[ 	].*$/d' -e '/^[ 	]*#$/d' < ${ARCHDIR}/../dot.profile	 > .profile
+SPECIAL sed -e '/^[ 	]*#[ 	].*$/d' -e '/^[ 	]*#$/d' -e "s/^ARCH=ARCH$/ARCH=`arch -ks`/" < ${ARCHDIR}/../install.md	 > install.md
+
 COPY	${DESTDIR}/usr/mdec/boot	boot
 SPECIAL sync; ${DESTDIR}/usr/mdec/binstall -v ffs ${TARGDIR}
diff --git a/distrib/sparc/ramdisk/dot.profile b/distrib/sparc/ramdisk/dot.profile
deleted file mode 100644
index 630c52ca8f8..00000000000
--- a/distrib/sparc/ramdisk/dot.profile
+++ /dev/null
@@ -1,81 +0,0 @@
-#	$OpenBSD: dot.profile,v 1.14 2002/04/01 01:31:39 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=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/sparc/ramdisk/list b/distrib/sparc/ramdisk/list
index 0c3c97275c8..3039e25e574 100644
--- a/distrib/sparc/ramdisk/list
+++ b/distrib/sparc/ramdisk/list
@@ -1,15 +1,13 @@
-#	$OpenBSD: list,v 1.12 2001/07/03 00:12:07 deraadt Exp $
+#	$OpenBSD: list,v 1.13 2002/04/21 17:11:27 deraadt Exp $
 #	$NetBSD: list,v 1.2.4.2 1996/06/26 19:25:00 pk Exp $
 
 # Sparc extra's
 LINK	instbin			sbin/disklabel
-
-SYMLINK	../../instbin		usr/bin/basename
-SYMLINK ../../instbin		usr/bin/grep usr/bin/egrep usr/bin/fgrep
-SYMLINK ../../instbin		usr/bin/rsh
-SYMLINK ../../instbin		usr/bin/tset usr/bin/reset
-SYMLINK	../../instbin		usr/bin/less usr/bin/more
-SYMLINK	../../instbin		usr/sbin/installboot
+LINK	instbin			usr/bin/grep usr/bin/egrep usr/bin/fgrep
+LINK	instbin			usr/bin/tset usr/bin/reset
+LINK	instbin			usr/bin/less usr/bin/more
+LINK	instbin			usr/sbin/installboot
+SPECIAL /bin/rm instbin
 
 SRCDIRS	sys/arch/sparc/stand
 
@@ -17,7 +15,7 @@ SRCDIRS	sys/arch/sparc/stand
 SYMLINK	/tmp	var/tmp
 
 # copy the MAKEDEV script and make some devices
-COPY	${DESTDIR}/dev/MAKEDEV		dev/MAKEDEV
+SPECIAL sed -e '/^[ 	]*#[ 	].*$/d' -e '/^[ 	]*#$/d' < ${DESTDIR}/dev/MAKEDEV	 > dev/MAKEDEV
 SPECIAL	cd dev; sh MAKEDEV ramdisk
 
 # we need the contents of /usr/mdec (but not boot or binstall)
@@ -35,5 +33,5 @@ SYMLINK	/tmp/resolv.conf.shadow		etc/resolv.conf
 SYMLINK	/tmp/hosts			etc/hosts
 
 # and the installation tools
-COPY	${ARCHDIR}/../ramdisk/dot.profile	.profile
-SPECIAL sed -e '/^#[ 	].*$/d' -e "s/^ARCH=ARCH$/ARCH=`arch -s`/" < ${ARCHDIR}/../install.md	 > install.md
+SPECIAL sed -e '/^[ 	]*#[ 	].*$/d' -e '/^[ 	]*#$/d' < ${ARCHDIR}/../dot.profile	 > .profile
+SPECIAL sed -e '/^[ 	]*#[ 	].*$/d' -e '/^[ 	]*#$/d' -e "s/^ARCH=ARCH$/ARCH=`arch -ks`/" < ${ARCHDIR}/../install.md	 > install.md