summaryrefslogtreecommitdiff
path: root/distrib/i386/floppies/common
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2001-04-09 06:55:41 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2001-04-09 06:55:41 +0000
commit66094334bd88c7d7087f30cb38117584cb0cd279 (patch)
treed43f34afd38a7a25aa774c7b383d19ee01273696 /distrib/i386/floppies/common
parent505a042a913b0e4324612c89276096104be13025 (diff)
only put wicontrol (and ancontrol now too) on floppyC
Diffstat (limited to 'distrib/i386/floppies/common')
-rw-r--r--distrib/i386/floppies/common/Makefile.inc4
-rw-r--r--distrib/i386/floppies/common/instbin.conf4
-rw-r--r--distrib/i386/floppies/common/list3
3 files changed, 5 insertions, 6 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