o Add support for local list and crunch files so ramdiskC and ramdisk_cd

can include wicontrol and ancontrol.
o Rename instbin.conf to crunch.conf
o Remove the custom list and crunch files from ramdiskC (no longer needed).

10 files changed, 33 insertions, 131 deletions

diff --git a/distrib/i386/floppies/common/Makefile.inc b/distrib/i386/floppies/common/Makefile.inc
index 54c05156864..78289b8a63b 100644
--- a/distrib/i386/floppies/common/Makefile.inc
+++ b/distrib/i386/floppies/common/Makefile.inc
@@ -1,11 +1,12 @@
-#	$OpenBSD: Makefile.inc,v 1.14 2002/03/30 02:33:23 krw Exp $
+#	$OpenBSD: Makefile.inc,v 1.15 2002/03/30 20:35:31 millert Exp $
 
 TOP=		${.CURDIR}/..
 
 .include "${TOP}/Makefile.inc"
 IMAGE=		mr.fs
 CBIN?=		instbin
-CRUNCHCONF?=    ${.CURDIR}/../common/${CBIN}.conf
+CRUNCHCONF?=	${CBIN}.conf
+CRUNCHCONFS?=	${.CURDIR}/../common/crunch.conf
 LISTS?=		${.CURDIR}/../common/list ${.CURDIR}
 
 MOUNT_POINT=	/mnt
@@ -105,6 +106,9 @@ ${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF}
 ${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c
 	make -f ${CBIN}.mk all
 
+${CRUNCHCONF}: ${CRUNCHCONFS}
+	cat ${CRUNCHCONFS} > ${CRUNCHCONF}
+
 do_files:
 	mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u
 	TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \
diff --git a/distrib/i386/floppies/common/instbin.conf b/distrib/i386/floppies/common/crunch.conf
index cb796dc1505..d0b63c52338 100644
--- a/distrib/i386/floppies/common/instbin.conf
+++ b/distrib/i386/floppies/common/crunch.conf
@@ -1,4 +1,4 @@
-#	$OpenBSD: instbin.conf,v 1.17 2001/10/02 01:08:11 deraadt Exp $
+#	$OpenBSD: crunch.conf,v 1.1 2002/03/30 20:35:31 millert Exp $
 #
 # instbin.conf - unified binary for the inst/upgr floppies
 #
diff --git a/distrib/i386/floppies/ramdiskC/Makefile b/distrib/i386/floppies/ramdiskC/Makefile
index 44e1224dea5..fe150bbf5fc 100644
--- a/distrib/i386/floppies/ramdiskC/Makefile
+++ b/distrib/i386/floppies/ramdiskC/Makefile
@@ -1,11 +1,11 @@
-#	$OpenBSD: Makefile,v 1.2 2001/04/09 06:55:40 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.3 2002/03/30 20:35:31 millert Exp $
 
 .PATH: ${.CURDIR}/../ramdisk
 RAMDISK=RAMDISKC
 XNAME=floppyC
 NOBSDRD=1
 
-CRUNCHCONF?=    ${.CURDIR}/${CBIN}.conf
-LISTS=		${.CURDIR}/list
-
 .include "${.CURDIR}/../common/Makefile.inc"
+
+CRUNCHCONFS+=	${.CURDIR}/crunch_local.conf
+LISTS+=		${.CURDIR}/list.local
diff --git a/distrib/i386/floppies/ramdiskC/crunch_local.conf b/distrib/i386/floppies/ramdiskC/crunch_local.conf
new file mode 100644
index 00000000000..93b31ebc99b
--- /dev/null
+++ b/distrib/i386/floppies/ramdiskC/crunch_local.conf
@@ -0,0 +1,4 @@
+# $OpenBSD: crunch_local.conf,v 1.1 2002/03/30 20:35:31 millert Exp $
+
+# Include wicontrol and ancontrol for wireless installs
+progs wicontrol ancontrol
diff --git a/distrib/i386/floppies/ramdiskC/instbin.conf b/distrib/i386/floppies/ramdiskC/instbin.conf
deleted file mode 100644
index e568075a377..00000000000
--- a/distrib/i386/floppies/ramdiskC/instbin.conf
+++ /dev/null
@@ -1,31 +0,0 @@
-#	$OpenBSD: instbin.conf,v 1.4 2001/10/02 01:08:11 deraadt Exp $
-#
-# instbin.conf - unified binary for the inst/upgr floppies
-#
-
-srcdirs distrib/special bin sbin usr.bin/less gnu/usr.bin usr.bin usr.sbin
-srcdirs usr.sbin/pppd sys/arch/i386/stand
-
-progs cat chmod cp dd df disklabel dhclient dmesg
-progs ed fsck_ffs ftp fdisk hostname
-progs ifconfig init less ln ls mkdir mknod mount mount_cd9660
-progs mount_ffs mount_msdos mount_ext2fs
-progs mv newfs pax ksh ping reboot rm route
-progs sed sleep stty umount wicontrol ancontrol
-progs rsh restore gzip grep installboot
-
-ln chmod chgrp
-ln chmod chown
-ln fsck_ffs fsck
-ln less more
-ln pax tar
-ln pax cpio
-ln ksh sh
-ln ksh -sh		# init invokes the shell this way
-ln reboot halt
-ln gzip gunzip
-ln grep egrep
-ln grep fgrep
-
-# Use -lotermcap instead of -ltermcap/-lcurses since it is smaller
-libs -lutil -lotermcap -lkrb -ldes -ll -lm
diff --git a/distrib/i386/floppies/ramdiskC/list b/distrib/i386/floppies/ramdiskC/list
deleted file mode 100644
index b3f3f325c1b..00000000000
--- a/distrib/i386/floppies/ramdiskC/list
+++ /dev/null
@@ -1,92 +0,0 @@
-#	$OpenBSD: list,v 1.7 2001/12/17 00:41:51 krw Exp $
-
-# copy the crunched binary, link to it, and kill it
-COPY	${OBJDIR}/instbin	instbin
-LINK	instbin			bin/cat
-LINK	instbin			bin/chmod
-LINK	instbin			bin/chgrp
-LINK	instbin			bin/cp
-LINK	instbin			bin/cpio bin/pax bin/tar
-LINK	instbin			bin/dd
-LINK	instbin			bin/df
-LINK	instbin			bin/ed
-LINK	instbin			bin/ln
-LINK	instbin			bin/ls
-LINK	instbin			bin/mkdir
-LINK	instbin			bin/mv
-LINK	instbin			bin/rm
-LINK	instbin			bin/hostname
-LINK	instbin			bin/sh bin/ksh
-LINK	instbin			bin/sleep
-LINK	instbin			bin/stty
-LINK	instbin			sbin/chown
-LINK	instbin			sbin/disklabel
-LINK	instbin			sbin/dhclient
-LINK	instbin			sbin/wicontrol
-LINK	instbin			sbin/ancontrol
-LINK	instbin			sbin/fdisk
-LINK	instbin			sbin/dmesg
-LINK	instbin			sbin/fsck sbin/fsck_ffs
-LINK	instbin			sbin/halt sbin/reboot
-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_msdos
-LINK	instbin			sbin/mount_ext2fs
-LINK	instbin			sbin/ping
-LINK	instbin			sbin/newfs
-LINK	instbin			sbin/restore
-LINK	instbin			sbin/route
-#LINK	instbin			sbin/scsi
-#LINK	instbin			sbin/swapon
-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/rsh
-LINK	instbin			usr/bin/sed
-LINK	instbin			usr/mdec/installboot
-SPECIAL	/bin/rm instbin
-
-# `internal' crunchgen links
-ARGVLINK sh		-sh
-
-# copy the MAKEDEV script and make some devices
-COPY	${DESTDIR}/dev/MAKEDEV	dev/MAKEDEV
-SPECIAL	cd dev; sh MAKEDEV ramdisk
-SPECIAL	/bin/rm dev/MAKEDEV
-
-# we need the contents of /usr/mdec
-COPY	${DESTDIR}/usr/mdec/biosboot	usr/mdec/biosboot
-COPY	${DESTDIR}/usr/mdec/mbr		usr/mdec/mbr
-COPY	${DESTDIR}/usr/mdec/boot	usr/mdec/boot
-
-# 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.shadow
-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
-
-# dhcp things
-COPY	${DESTDIR}/sbin/dhclient-script sbin/dhclient-script
-
-# and the common installation tools
-COPY	${CURDIR}/../common/termcap.vt		usr/share/misc/termcap
-#COPY	${DESTDIR}/usr/share/misc/scsi_modes	usr/share/misc/scsi_modes
-
-# and the installation tools
-SPECIAL sed -e '/^[ 	]*#[ 	].*$/d' -e '/^[ 	]*#$/d' < ${CURDIR}/../common/dot.profile	 > .profile
-SPECIAL sed -e '/^[ 	]*#[ 	].*$/d' -e '/^[ 	]*#$/d' -e "s/^ARCH=ARCH$/ARCH=`arch -s`/" < ${CURDIR}/../common/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
diff --git a/distrib/i386/floppies/ramdiskC/list.local b/distrib/i386/floppies/ramdiskC/list.local
new file mode 100644
index 00000000000..704e5326aae
--- /dev/null
+++ b/distrib/i386/floppies/ramdiskC/list.local
@@ -0,0 +1,5 @@
+# $OpenBSD: list.local,v 1.1 2002/03/30 20:35:31 millert Exp $
+
+# add local links; use bin/sh since instbin has already been unlinked
+LINK	bin/sh		sbin/wicontrol
+LINK	bin/sh		sbin/ancontrol
diff --git a/distrib/i386/floppies/ramdisk_cd/Makefile b/distrib/i386/floppies/ramdisk_cd/Makefile
index 6990bdf1f07..c0a5811ca5b 100644
--- a/distrib/i386/floppies/ramdisk_cd/Makefile
+++ b/distrib/i386/floppies/ramdisk_cd/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.3 2001/11/09 16:27:29 todd Exp $
+#	$OpenBSD: Makefile,v 1.4 2002/03/30 20:35:31 millert Exp $
 
 .PATH: ${.CURDIR}/../ramdisk
 RAMDISK=RAMDISK_CD
@@ -8,3 +8,6 @@ XNAME=cdrom
 FLOPPYSECS=36
 
 .include "${.CURDIR}/../common/Makefile.inc"
+
+CRUNCHCONFS+=	${.CURDIR}/crunch_local.conf
+LISTS+=		${.CURDIR}/list.local
diff --git a/distrib/i386/floppies/ramdisk_cd/crunch_local.conf b/distrib/i386/floppies/ramdisk_cd/crunch_local.conf
new file mode 100644
index 00000000000..93b31ebc99b
--- /dev/null
+++ b/distrib/i386/floppies/ramdisk_cd/crunch_local.conf
@@ -0,0 +1,4 @@
+# $OpenBSD: crunch_local.conf,v 1.1 2002/03/30 20:35:31 millert Exp $
+
+# Include wicontrol and ancontrol for wireless installs
+progs wicontrol ancontrol
diff --git a/distrib/i386/floppies/ramdisk_cd/list.local b/distrib/i386/floppies/ramdisk_cd/list.local
new file mode 100644
index 00000000000..704e5326aae
--- /dev/null
+++ b/distrib/i386/floppies/ramdisk_cd/list.local
@@ -0,0 +1,5 @@
+# $OpenBSD: list.local,v 1.1 2002/03/30 20:35:31 millert Exp $
+
+# add local links; use bin/sh since instbin has already been unlinked
+LINK	bin/sh		sbin/wicontrol
+LINK	bin/sh		sbin/ancontrol