only put wicontrol (and ancontrol now too) on floppyC

6 files changed, 131 insertions, 7 deletions

diff --git a/distrib/i386/floppies/common/Makefile.inc b/distrib/i386/floppies/common/Makefile.inc
index 429c2afa0b1..669b470f9c7 100644
--- a/distrib/i386/floppies/common/Makefile.inc
+++ b/distrib/i386/floppies/common/Makefile.inc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.10 2001/01/29 01:16:50 deraadt Exp $
+#	$OpenBSD: Makefile.inc,v 1.11 2001/04/09 06:55:40 deraadt Exp $
 
 TOP=		${.CURDIR}/..
 
@@ -10,7 +10,7 @@ CRUNCHCONF?=    ${.CURDIR}/../common/${CBIN}.conf
 .else
 CRUNCHCONF?=    ${.CURDIR}/../common/${CBIN}-nokrb.conf
 .endif
-LISTS=		${.CURDIR}/../common/list
+LISTS?=		${.CURDIR}/../common/list ${.CURDIR}
 
 MOUNT_POINT=	/mnt
 MTREE=		${.CURDIR}/../common/mtree.conf
diff --git a/distrib/i386/floppies/common/instbin.conf b/distrib/i386/floppies/common/instbin.conf
index cda556b6101..a790a4c995c 100644
--- a/distrib/i386/floppies/common/instbin.conf
+++ b/distrib/i386/floppies/common/instbin.conf
@@ -1,4 +1,4 @@
-#	$OpenBSD: instbin.conf,v 1.14 2001/01/27 00:21:45 deraadt Exp $
+#	$OpenBSD: instbin.conf,v 1.15 2001/04/09 06:55:40 deraadt Exp $
 #
 # instbin.conf - unified binary for the inst/upgr floppies
 #
@@ -11,7 +11,7 @@ progs fsck_ffs ftp fdisk
 progs ifconfig init less ln ls mkdir mknod mount mount_cd9660
 progs mount_ffs mount_msdos mount_kernfs mount_ext2fs
 progs mv newfs pax ksh ping reboot rm route
-progs sed sleep stty umount wicontrol
+progs sed sleep stty umount
 progs rsh restore gzip grep installboot
 
 ln chmod chgrp
diff --git a/distrib/i386/floppies/common/list b/distrib/i386/floppies/common/list
index 59aa4fb7952..cd8c95edcc3 100644
--- a/distrib/i386/floppies/common/list
+++ b/distrib/i386/floppies/common/list
@@ -1,4 +1,4 @@
-#	$OpenBSD: list,v 1.17 2001/03/03 08:13:46 deraadt Exp $
+#	$OpenBSD: list,v 1.18 2001/04/09 06:55:40 deraadt Exp $
 
 # copy the crunched binary, link to it, and kill it
 COPY	${OBJDIR}/instbin	instbin
@@ -21,7 +21,6 @@ LINK	instbin			bin/stty
 LINK	instbin			sbin/chown
 LINK	instbin			sbin/disklabel
 LINK	instbin			sbin/dhclient
-LINK	instbin			sbin/wicontrol
 LINK	instbin			sbin/fdisk
 LINK	instbin			sbin/fsck sbin/fsck_ffs
 LINK	instbin			sbin/halt sbin/reboot
diff --git a/distrib/i386/floppies/ramdiskC/Makefile b/distrib/i386/floppies/ramdiskC/Makefile
index ef7d12878a2..44e1224dea5 100644
--- a/distrib/i386/floppies/ramdiskC/Makefile
+++ b/distrib/i386/floppies/ramdiskC/Makefile
@@ -1,8 +1,11 @@
-#	$OpenBSD: Makefile,v 1.1 2000/07/11 19:23:58 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.2 2001/04/09 06:55:40 deraadt Exp $
 
 .PATH: ${.CURDIR}/../ramdisk
 RAMDISK=RAMDISKC
 XNAME=floppyC
 NOBSDRD=1
 
+CRUNCHCONF?=    ${.CURDIR}/${CBIN}.conf
+LISTS=		${.CURDIR}/list
+
 .include "${.CURDIR}/../common/Makefile.inc"
diff --git a/distrib/i386/floppies/ramdiskC/instbin.conf b/distrib/i386/floppies/ramdiskC/instbin.conf
new file mode 100644
index 00000000000..7b732917f00
--- /dev/null
+++ b/distrib/i386/floppies/ramdiskC/instbin.conf
@@ -0,0 +1,31 @@
+#	$OpenBSD: instbin.conf,v 1.1 2001/04/09 06:55:40 deraadt Exp $
+#
+# instbin.conf - unified binary for the inst/upgr floppies
+#
+
+srcdirs distrib/special bin sbin usr.bin/less usr.bin usr.sbin gnu/usr.bin
+srcdirs usr.sbin/pppd sys/arch/i386/stand
+
+progs cat chmod cp dd df disklabel dhclient ed
+progs fsck_ffs ftp fdisk
+progs ifconfig init less ln ls mkdir mknod mount mount_cd9660
+progs mount_ffs mount_msdos mount_kernfs 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
new file mode 100644
index 00000000000..6dc5107d2aa
--- /dev/null
+++ b/distrib/i386/floppies/ramdiskC/list
@@ -0,0 +1,91 @@
+#	$OpenBSD: list,v 1.1 2001/04/09 06:55:40 deraadt 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/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/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_kernfs
+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/protocols	etc/protocols
+COPY	${DESTDIR}/etc/services		etc/services
+COPY	${DESTDIR}/etc/spwd.db		etc/spwd.db
+COPY	${DESTDIR}/etc/disktab		etc/disktab.shadow
+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
+COPY	${CURDIR}/../common/dot.profile			.profile
+COPY	${CURDIR}/../common/install.md			install.md
+COPY	${CURDIR}/../../../miniroot/install.sh		install
+COPY	${CURDIR}/../../../miniroot/upgrade.sh		upgrade
+SPECIAL sed "/^VERSION=/s/=.*/=${REV}/" < ${CURDIR}/../../../miniroot/install.sub > install.sub
+SPECIAL	chmod 755 install upgrade