From 9235b2e4e069921e4de38f94c23b77c13a9c877c Mon Sep 17 00:00:00 2001 From: deraadt Date: Thu, 17 Apr 1997 01:59:57 +0000 Subject: [PATCH] add pppd, chat, and /etc/ppp files. (it fits!) --- distrib/i386/floppies/common/instbin-krb.conf | 6 +++--- distrib/i386/floppies/common/instbin.conf | 10 +++++----- distrib/i386/floppies/common/list | 6 +++++- distrib/i386/floppies/common/mtree.conf | 8 +++++++- distrib/i386/floppies/ramdisk/instbin.conf | 12 ++++++------ distrib/i386/floppies/ramdisk/mtree.conf | 8 +++++++- 6 files changed, 33 insertions(+), 17 deletions(-) diff --git a/distrib/i386/floppies/common/instbin-krb.conf b/distrib/i386/floppies/common/instbin-krb.conf index 48d1a327a86..b7fc0af15fd 100644 --- a/distrib/i386/floppies/common/instbin-krb.conf +++ b/distrib/i386/floppies/common/instbin-krb.conf @@ -1,15 +1,15 @@ -# $OpenBSD: instbin-krb.conf,v 1.2 1997/04/14 10:56:10 deraadt Exp $ +# $OpenBSD: instbin-krb.conf,v 1.3 1997/04/17 01:59:57 deraadt Exp $ # # instbin.conf - unified binary for the inst/upgr floppies # -srcdirs bin sbin usr.bin/less usr.bin usr.sbin gnu/usr.bin +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 ftp fdisk progs ifconfig init less ln ls mkdir mknod mount mount_cd9660 progs mount_ffs mount_msdos mount_nfs mount_kernfs -progs mv newfs pax pdksh ping pwd reboot rm route +progs mv newfs pax pdksh ping pppd pwd reboot rm route progs sed shutdown slattach strings stty sync test tip umount progs rsh restore gzip diff --git a/distrib/i386/floppies/common/instbin.conf b/distrib/i386/floppies/common/instbin.conf index baf0aca95f7..c0d13f49eeb 100644 --- a/distrib/i386/floppies/common/instbin.conf +++ b/distrib/i386/floppies/common/instbin.conf @@ -1,15 +1,15 @@ -# $OpenBSD: instbin.conf,v 1.1 1997/04/13 17:17:45 mickey Exp $ +# $OpenBSD: instbin.conf,v 1.2 1997/04/17 01:59:57 deraadt Exp $ # # instbin.conf - unified binary for the inst/upgr floppies # -srcdirs bin sbin usr.bin/less usr.bin usr.sbin gnu/usr.bin +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 ftp fdisk +progs awk bad144 cat chat chmod chown chroot 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 -progs mv newfs pax pdksh ping pwd reboot rm route +progs mv newfs pax pdksh ping pppd pwd reboot rm route progs sed shutdown slattach strings stty sync test tip umount progs rsh restore gzip diff --git a/distrib/i386/floppies/common/list b/distrib/i386/floppies/common/list index 1ce75252194..87384650446 100644 --- a/distrib/i386/floppies/common/list +++ b/distrib/i386/floppies/common/list @@ -1,4 +1,4 @@ -# $Id: list,v 1.2 1997/04/14 10:56:22 deraadt Exp $ +# $Id: list,v 1.3 1997/04/17 01:59:58 deraadt Exp $ # copy the crunched binary, link to it, and kill it COPY ${OBJDIR}/instbin instbin @@ -56,8 +56,10 @@ SYMLINK /bin/cat usr/bin/sed SYMLINK /bin/cat usr/bin/strings SYMLINK /bin/cat usr/bin/tip 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 # copy the MAKEDEV script and make some devices @@ -77,6 +79,8 @@ 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 diff --git a/distrib/i386/floppies/common/mtree.conf b/distrib/i386/floppies/common/mtree.conf index c68e3d047fe..1906d232524 100644 --- a/distrib/i386/floppies/common/mtree.conf +++ b/distrib/i386/floppies/common/mtree.conf @@ -1,4 +1,4 @@ -# $Id: mtree.conf,v 1.1 1997/04/13 17:17:46 mickey Exp $ +# $Id: mtree.conf,v 1.2 1997/04/17 01:59:58 deraadt Exp $ /set type=dir uname=root gname=wheel mode=0755 # . @@ -16,6 +16,12 @@ dev # ./etc etc + +# ./etc/ppp +ppp +# ./etc/ppp +.. + # ./etc .. diff --git a/distrib/i386/floppies/ramdisk/instbin.conf b/distrib/i386/floppies/ramdisk/instbin.conf index f6aa305cb45..13dba3e049f 100644 --- a/distrib/i386/floppies/ramdisk/instbin.conf +++ b/distrib/i386/floppies/ramdisk/instbin.conf @@ -1,15 +1,15 @@ -# $OpenBSD: instbin.conf,v 1.1 1997/04/14 10:57:12 deraadt Exp $ +# $OpenBSD: instbin.conf,v 1.2 1997/04/17 01:59:59 deraadt Exp $ # # instbin.conf - unified binary for the inst/upgr floppies # -srcdirs bin sbin usr.bin/less usr.bin usr.sbin gnu/usr.bin +srcdirs bin sbin usr.bin/less usr.bin usr.sbin gnu/usr.bin usr.sbin/pppd -progs bad144 cat chmod chown chroot cp dd df disklabel ed expr fsck_ffs -progs ftp fdisk +progs bad144 cat chat chmod chown chroot 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 -progs mv newfs pax pdksh ping pwd reboot rm route +progs mount_ffs mount_msdos mount_nfs mount_kernfs mount_ext2fs +progs mv newfs pax pdksh ping pppd pwd reboot rm route progs sed shutdown slattach strings stty sync test tip umount progs rsh restore gzip diff --git a/distrib/i386/floppies/ramdisk/mtree.conf b/distrib/i386/floppies/ramdisk/mtree.conf index e042cb0ff01..da5d763a722 100644 --- a/distrib/i386/floppies/ramdisk/mtree.conf +++ b/distrib/i386/floppies/ramdisk/mtree.conf @@ -1,4 +1,4 @@ -# $Id: mtree.conf,v 1.1 1997/04/13 17:17:55 mickey Exp $ +# $Id: mtree.conf,v 1.2 1997/04/17 02:00:00 deraadt Exp $ /set type=dir uname=root gname=wheel mode=0755 # . @@ -16,6 +16,12 @@ dev # ./etc etc + +# ./etc/ppp +ppp +# ./etc/ppp +.. + # ./etc .. -- 2.20.1