bit by bit i will fix this madness

3 files changed, 106 insertions, 15 deletions

diff --git a/distrib/sparc64/bsd.rd/Makefile b/distrib/sparc64/bsd.rd/Makefile
index 05f07c7dfea..18b7402d934 100644
--- a/distrib/sparc64/bsd.rd/Makefile
+++ b/distrib/sparc64/bsd.rd/Makefile
@@ -1,13 +1,11 @@
-#	$OpenBSD: Makefile,v 1.2 2001/10/12 19:04:56 jason Exp $
+#	$OpenBSD: Makefile,v 1.3 2002/04/21 07:30:58 deraadt Exp $
 
 TOP=		${.CURDIR}/..
 
 .include "${TOP}/Makefile.inc"
 IMAGE=		ramdisk${REV}.fs
 CBIN?=		instbin
-CRUNCHCONF?=    ${TOP}/common/${CBIN}.conf
-CRUNCHCONF?=    ${.CURDIR}/../common/${CBIN}.conf
-LISTS?=		${.CURDIR}/../common/list ${.CURDIR}/list
+LISTS?=		${.CURDIR}/list
 
 MOUNT_POINT=	/mnt
 
diff --git a/distrib/sparc64/bsd.rd/instbin.conf b/distrib/sparc64/bsd.rd/instbin.conf
new file mode 100644
index 00000000000..0a3ace7a277
--- /dev/null
+++ b/distrib/sparc64/bsd.rd/instbin.conf
@@ -0,0 +1,32 @@
+#       $OpenBSD: instbin.conf,v 1.1 2002/04/21 07:30:58 deraadt Exp $
+#
+# instbin.conf - unified binary for the inst/upgr floppies
+#
+
+srcdirs distrib/special
+srcdirs gnu/usr.bin usr.bin bin sbin usr.sbin
+
+progs dd mount_cd9660 df dhclient mount sync restore
+progs stty ln disklabel pax ping cat ifconfig dmesg ls
+progs less mount_nfs grep umount rsh fsck
+progs mknod route ftp mount_ffs reboot ed
+progs cp gzip chmod fsck_ffs init newfs
+progs tip rm mt mkdir sed ksh sleep
+progs mv expr test hostname
+
+ln mt eject
+ln chmod chgrp
+ln chmod chown
+ln pax tar
+ln pax cpio
+ln less more
+ln grep fgrep
+ln grep egrep
+ln reboot halt
+ln gzip gunzip
+ln gzip gzcat
+ln ksh sh
+ln ksh -sh
+ln test [
+
+libs -ledit -lutil -lcurses -ll -lm -lkvm -lz -lkrb -ldes
diff --git a/distrib/sparc64/bsd.rd/list b/distrib/sparc64/bsd.rd/list
index 873e2eb12b5..de0c73486c6 100644
--- a/distrib/sparc64/bsd.rd/list
+++ b/distrib/sparc64/bsd.rd/list
@@ -1,19 +1,80 @@
-#	$OpenBSD: list,v 1.5 2002/04/19 23:19:33 deraadt Exp $
+#	$OpenBSD: list,v 1.6 2002/04/21 07:30:58 deraadt Exp $
+#	$NetBSD: list,v 1.4.4.1 1996/06/20 20:30:26 pk Exp $
 
-# we strip comments from files since we need the space...
+SRCDIRS distrib/special
+SRCDIRS gnu/usr.bin usr.bin bin sbin usr.sbin
 
+# copy the crunched binary, link to it, and kill it
+COPY	${OBJDIR}/instbin	instbin
+LINK	instbin			bin/cat
+LINK	instbin			bin/chmod bin/chgrp sbin/chown
+LINK	instbin			bin/cp
+LINK	instbin			bin/dd
+LINK	instbin			bin/df
+LINK	instbin			bin/ed
+LINK	instbin			bin/expr
+LINK	instbin			bin/hostname
+LINK	instbin			bin/ksh bin/sh
+LINK	instbin			bin/ln
+LINK	instbin			bin/ls
+LINK	instbin			bin/mkdir
+LINK	instbin			bin/mt bin/eject
+LINK	instbin			bin/mv
+LINK	instbin			bin/pax bin/tar bin/cpio
+LINK	instbin			bin/rm
+LINK	instbin			bin/sleep
+LINK	instbin			bin/stty
+LINK	instbin			bin/sync
+LINK	instbin			bin/test bin/[
+LINK	instbin			sbin/dhclient
+LINK	instbin			sbin/disklabel
+LINK	instbin			sbin/dmesg
+LINK	instbin			sbin/fsck_ffs sbin/fsck
+LINK	instbin			sbin/ifconfig
+LINK	instbin			sbin/init
+LINK	instbin			sbin/mknod
+LINK	instbin			sbin/mount
+LINK	instbin			sbin/mount_cd9660
+LINK	instbin			sbin/mount_ffs
+LINK	instbin			sbin/mount_nfs
+LINK	instbin			sbin/newfs sbin/mount_mfs
+LINK	instbin			sbin/ping
+LINK	instbin			sbin/reboot sbin/halt
+LINK	instbin			sbin/route
+LINK	instbin			sbin/umount
+LINK	instbin			usr/bin/egrep usr/bin/fgrep usr/bin/grep
+LINK	instbin			usr/bin/ftp
+LINK	instbin			usr/bin/gzip usr/bin/gunzip usr/bin/gzcat
+LINK	instbin			usr/bin/less usr/bin/more
+LINK	instbin			usr/bin/sed
 SPECIAL /bin/rm instbin
 
-# the disktab explanation file
-#SPECIAL sed -e '/^#[ 	].*$/d' < ${CURDIR}/../common/disktab.preinstall > etc/disktab.preinstall
+ARGVLINK ksh			-sh
 
-#COPY	${DESTDIR}/dev/MAKEDEV	dev/MAKEDEV
 SPECIAL	sed -e '/^[ 	]*#[ 	].*$/d' -e '/^[ 	]*#$/d' < ${DESTDIR}/dev/MAKEDEV > dev/MAKEDEV
 SPECIAL	cd dev; sh MAKEDEV ramdisk
-#SPECIAL rm dev/MAKEDEV
 
-# and the installation tools
-#SPECIAL	sed -e '/^[ 	]*#[ 	].*$/d' -e '/^[ 	]*#$/d' < ${CURDIR}/../../miniroot/install.sh > install
-#SPECIAL sed -e '/^[ 	]*#[ 	].*$/d' -e '/^[ 	]*#$/d' -e "s/^ARCH=ARCH$/ARCH=`arch -s`/" < ${CURDIR}/../common/install.md > install.md
-#SPECIAL	chmod 755 install
-#SPECIAL chmod 755 upgrade
+# various files that we need in /etc for the install
+COPY	${DESTDIR}/etc/group			etc/group
+COPY	${DESTDIR}/etc/spwd.db			etc/spwd.db
+#COPY	${DESTDIR}/etc/disktab			etc/disktab
+COPY	${CURDIR}/../../miniroot/protocols	etc/protocols
+COPY	${CURDIR}/../../miniroot/services	etc/services
+SYMLINK	/tmp/disktab.shadow			etc/disktab      
+SYMLINK	/tmp/fstab.shadow			etc/fstab
+SYMLINK	/tmp/resolv.conf.shadow			etc/resolv.conf
+SYMLINK	/tmp/hosts				etc/hosts
+
+# and the common installation tools
+COPY    ${TOPDIR}/common/termcap.vt        usr/share/misc/termcap
+
+# and the installation scripts
+SPECIAL	sed -e '/^[ 	]*#[ 	].*$/d' -e '/^[ 	]*#$/d' < ${CURDIR}/../common/dot.profile > .profile
+SPECIAL sed -e '/^[ 	]*#[ 	].*$/d' -e '/^[ 	]*#$/d' -e "s/^ARCH=ARCH$/ARCH=`arch -ks`/" < ${CURDIR}/../common/install.md > install.md
+SPECIAL sed -e '/^[ 	]*#[ 	].*$/d' -e '/^[ 	]*#$/d' < ${CURDIR}/../../miniroot/install.sh > install
+SPECIAL sed -e '/^[ 	]*#[ 	].*$/d' -e '/^[ 	]*#$/d' < ${CURDIR}/../../miniroot/install.sh > upgrade
+SPECIAL sed -e '/^[ 	]*#[ 	].*$/d' -e '/^[ 	]*#$/d' -e "/^VERSION=/s/=.*/=${REV}/" < ${CURDIR}/../../miniroot/install.sub > install.sub
+SPECIAL	chmod 755 install upgrade
+
+# dhcp things
+COPY	${DESTDIR}/sbin/dhclient-script sbin/dhclient-script