diff options
Diffstat (limited to 'distrib/i386')
| -rw-r--r-- | distrib/i386/floppies/common/Makefile.inc | 6 | ||||
| -rw-r--r-- | distrib/i386/floppies/common/instbin-nokrb.conf | 31 |
2 files changed, 1 insertions, 36 deletions
diff --git a/distrib/i386/floppies/common/Makefile.inc b/distrib/i386/floppies/common/Makefile.inc index 298802b0ac9..b165620cbb5 100644 --- a/distrib/i386/floppies/common/Makefile.inc +++ b/distrib/i386/floppies/common/Makefile.inc @@ -1,15 +1,11 @@ -# $OpenBSD: Makefile.inc,v 1.12 2001/05/11 15:23:07 deraadt Exp $ +# $OpenBSD: Makefile.inc,v 1.13 2002/02/10 22:50:48 deraadt Exp $ TOP= ${.CURDIR}/.. .include "${TOP}/Makefile.inc" IMAGE= mr.fs CBIN?= instbin -.if (${KERBEROS:L} == "yes") CRUNCHCONF?= ${.CURDIR}/../common/${CBIN}.conf -.else -CRUNCHCONF?= ${.CURDIR}/../common/${CBIN}-nokrb.conf -.endif LISTS?= ${.CURDIR}/../common/list ${.CURDIR} MOUNT_POINT= /mnt diff --git a/distrib/i386/floppies/common/instbin-nokrb.conf b/distrib/i386/floppies/common/instbin-nokrb.conf deleted file mode 100644 index 1f7ea1afac6..00000000000 --- a/distrib/i386/floppies/common/instbin-nokrb.conf +++ /dev/null @@ -1,31 +0,0 @@ -# $OpenBSD: instbin-nokrb.conf,v 1.9 2001/10/02 01:08:11 deraadt Exp $ -# -# instbin-nokrb.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 ed -progs fsck_ffs ftp fdisk -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 -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 -ll -lm |