diff options
| -rw-r--r-- | distrib/i386/floppies/common/instbin-krb.conf | 8 | ||||
| -rw-r--r-- | distrib/i386/floppies/common/instbin.conf | 8 | ||||
| -rw-r--r-- | distrib/i386/floppies/common/list | 14 | ||||
| -rw-r--r-- | distrib/i386/floppies/ramdisk/Makefile | 11 | ||||
| -rw-r--r-- | distrib/i386/floppies/ramdisk/dot.profile | 3 | ||||
| -rw-r--r-- | distrib/i386/floppies/ramdisk/instbin.conf | 12 |
6 files changed, 24 insertions, 32 deletions
diff --git a/distrib/i386/floppies/common/instbin-krb.conf b/distrib/i386/floppies/common/instbin-krb.conf index 1b0dd4c7613..e359b007329 100644 --- a/distrib/i386/floppies/common/instbin-krb.conf +++ b/distrib/i386/floppies/common/instbin-krb.conf @@ -1,16 +1,16 @@ -# $OpenBSD: instbin-krb.conf,v 1.6 1997/04/25 18:51:27 deraadt Exp $ +# $OpenBSD: instbin-krb.conf,v 1.7 1997/05/07 06:03:21 deraadt Exp $ # # instbin.conf - unified binary for the inst/upgr floppies # srcdirs bin sbin usr.bin/less usr.bin usr.sbin gnu/usr.bin usr.sbin/pppd -progs awk bad144 cat chmod chown chroot cp dd df disklabel ed expr fsck_ffs +progs awk bad144 cat chmod chown cp dd df disklabel ed expr fsck_ffs progs ftp fdisk progs ifconfig init less ln ls mkdir mknod mount mount_cd9660 -progs mount_ffs mount_msdos mount_nfs mount_kernfs mount_ext2fs +progs mount_ffs mount_msdos mount_nfs mount_kernfs progs mv newfs pax pdksh ping pppd pwd reboot rm route -progs scsi sed shutdown slattach strings stty sync test tip umount +progs scsi sed shutdown slattach stty sync test tip umount progs rsh restore gzip ln chown chgrp diff --git a/distrib/i386/floppies/common/instbin.conf b/distrib/i386/floppies/common/instbin.conf index 90c9be780b4..829e21f9d2e 100644 --- a/distrib/i386/floppies/common/instbin.conf +++ b/distrib/i386/floppies/common/instbin.conf @@ -1,16 +1,16 @@ -# $OpenBSD: instbin.conf,v 1.5 1997/04/25 18:51:28 deraadt Exp $ +# $OpenBSD: instbin.conf,v 1.6 1997/05/07 06:03:22 deraadt Exp $ # # instbin.conf - unified binary for the inst/upgr floppies # srcdirs bin sbin usr.bin/less usr.bin usr.sbin gnu/usr.bin usr.sbin/pppd -progs awk bad144 cat chat chmod chown chroot cp dd df disklabel ed +progs awk bad144 cat chat chmod chown cp dd df disklabel ed progs expr fsck_ffs ftp fdisk progs ifconfig init less ln ls mkdir mknod mount mount_cd9660 -progs mount_ffs mount_msdos mount_nfs mount_kernfs mount_ext2fs +progs mount_ffs mount_msdos mount_nfs mount_kernfs progs mv newfs pax pdksh ping pppd pwd reboot rm route -progs scsi sed shutdown slattach strings stty sync test tip umount +progs scsi sed shutdown slattach stty sync test tip umount progs rsh restore gzip ln chown chgrp diff --git a/distrib/i386/floppies/common/list b/distrib/i386/floppies/common/list index 9f3898bb27c..8db14353c86 100644 --- a/distrib/i386/floppies/common/list +++ b/distrib/i386/floppies/common/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.8 1997/05/03 23:11:08 tholo Exp $ +# $OpenBSD: list,v 1.9 1997/05/07 06:03:22 deraadt Exp $ # copy the crunched binary, link to it, and kill it COPY ${OBJDIR}/instbin instbin @@ -61,12 +61,11 @@ SYMLINK /bin/cat usr/bin/more SYMLINK /bin/cat usr/bin/rsh SYMLINK /bin/cat usr/bin/sed SYMLINK /bin/cat usr/bin/sort -SYMLINK /bin/cat usr/bin/strings SYMLINK /bin/cat usr/bin/tip +SYMLINK /bin/cat usr/bin/vi SYMLINK /bin/cat usr/sbin/bad144 SYMLINK /bin/cat usr/sbin/chat SYMLINK /bin/cat usr/sbin/chown -SYMLINK /bin/cat usr/sbin/chroot SYMLINK /bin/cat usr/sbin/pppd SPECIAL /bin/rm instbin @@ -76,20 +75,19 @@ SPECIAL cd dev; sh MAKEDEV ramdisk SPECIAL /bin/rm dev/MAKEDEV # we need the contents of /usr/mdec -COPYDIR ${DESTDIR}/usr/mdec usr/mdec +COPY ${DESTDIR}/usr/mdec/bootsd usr/mdec/bootsd +SPECIAL cd usr/mdec; ln bootsd bootwd +COPY ${DESTDIR}/usr/mdec/bootsd usr/mdec/sdboot +SPECIAL cd usr/mdec; ln sdboot wdboot # various files that we need in /etc for the install COPY ${DESTDIR}/etc/group etc/group -COPY ${DESTDIR}/etc/master.passwd etc/master.passwd -COPY ${DESTDIR}/etc/passwd etc/passwd COPY ${DESTDIR}/etc/protocols etc/protocols -COPY ${DESTDIR}/etc/pwd.db etc/pwd.db COPY ${DESTDIR}/etc/services etc/services COPY ${DESTDIR}/etc/spwd.db etc/spwd.db COPYDIR ${DESTDIR}/etc/ppp etc/ppp # and the common installation tools -COPY ${TOPDIR}/common/dot.commonutils .commonutils COPY ${TOPDIR}/common/termcap.pc3 usr/share/misc/termcap COPY ${DESTDIR}/usr/share/misc/scsi_modes usr/share/misc/scsi_modes diff --git a/distrib/i386/floppies/ramdisk/Makefile b/distrib/i386/floppies/ramdisk/Makefile index 039d4df69aa..123f78bd5a2 100644 --- a/distrib/i386/floppies/ramdisk/Makefile +++ b/distrib/i386/floppies/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.13 1997/05/07 04:46:52 deraadt Exp $ +# $OpenBSD: Makefile,v 1.14 1997/05/07 06:03:24 deraadt Exp $ # Revision is 2.1 REV= 21 @@ -26,17 +26,10 @@ LISTFLOPPY= ${.CURDIR}/list_floppy all: ${FS} ${FS}: bsd.gz -.ifndef FLOPPY3 - dd if=/dev/zero of=${REALIMAGE} bs=10k count=120 - vnconfig -v -c ${VND} ${REALIMAGE} - disklabel -w -r ${VND} floppy5 - newfs -m 0 -o space -i 8192 -c 80 ${VND_RDEV} floppy5 -.else dd if=/dev/zero of=${REALIMAGE} bs=10k count=144 vnconfig -v -c ${VND} ${REALIMAGE} disklabel -w -r ${VND} floppy3 - newfs -m 0 -o space -i 32768 -c 80 ${VND_RDEV} floppy3 -.endif + newfs -m 0 -o space -i 524288 -c 80 ${VND_RDEV} floppy3 mount ${VND_DEV} ${MOUNT_POINT} TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \ TARGDIR=${MOUNT_POINT} sh ${TOP}/runlist.sh ${LISTFLOPPY} diff --git a/distrib/i386/floppies/ramdisk/dot.profile b/distrib/i386/floppies/ramdisk/dot.profile index 13e93aa0812..f69f10e12b9 100644 --- a/distrib/i386/floppies/ramdisk/dot.profile +++ b/distrib/i386/floppies/ramdisk/dot.profile @@ -1,4 +1,4 @@ -# $OpenBSD: dot.profile,v 1.4 1997/05/03 07:50:15 tholo Exp $ +# $OpenBSD: dot.profile,v 1.5 1997/05/07 06:03:25 deraadt Exp $ # # Copyright (c) 1994 Christopher G. Demetriou # All rights reserved. @@ -50,7 +50,6 @@ if [ "X${DONEPROFILE}" = "X" ]; then mount -t kernfs /kern /kern # pull in the functions that people will use from the shell prompt. - . /.commonutils . /.instutils echo "Follow the installation directions to install or upgrade" diff --git a/distrib/i386/floppies/ramdisk/instbin.conf b/distrib/i386/floppies/ramdisk/instbin.conf index 31c2fb348b0..e3eacd30ae0 100644 --- a/distrib/i386/floppies/ramdisk/instbin.conf +++ b/distrib/i386/floppies/ramdisk/instbin.conf @@ -1,16 +1,17 @@ -# $OpenBSD: instbin.conf,v 1.7 1997/05/03 23:11:09 tholo Exp $ +# $OpenBSD: instbin.conf,v 1.8 1997/05/07 06:03:26 deraadt Exp $ # # instbin.conf - unified binary for the inst/upgr floppies # srcdirs bin sbin usr.bin/less usr.bin usr.sbin gnu/usr.bin usr.sbin/pppd +srcdirs usr.bin/vi -progs bad144 cat chat chmod chown chroot cp dd df disklabel ed +progs bad144 cat chat chmod chown cp dd df disklabel ed progs expr fsck_ffs ftp fdisk hostname progs ifconfig init less ln ls mkdir mknod mount mount_cd9660 progs mount_ffs mount_msdos mount_nfs mount_kernfs mount_ext2fs -progs mv newfs pax pdksh ping pppd pwd reboot rm route -progs scsi sed shutdown slattach sleep strings stty sync test tip umount +progs mv newfs pax pdksh ping pppd pwd reboot rm route build +progs scsi sed shutdown sleep stty sync test tip umount progs rsh restore gzip sort grep cut ln chown chgrp @@ -25,5 +26,6 @@ ln reboot halt ln gzip gunzip ln grep egrep ln grep fgrep +ln build vi -libs -ledit -lutil -ltermcap -lkrb -ldes -ll -lm +libs -ledit -lutil -lcurses -lkrb -ldes -ll -lm -ltermlib |