add dhclient support; remove ppp/slip for now

3 files changed, 16 insertions, 10 deletions

diff --git a/distrib/i386/floppies/ramdisk/instbin.conf b/distrib/i386/floppies/ramdisk/instbin.conf
index 97ffa23ab9e..70baafdb40e 100644
--- a/distrib/i386/floppies/ramdisk/instbin.conf
+++ b/distrib/i386/floppies/ramdisk/instbin.conf
@@ -1,4 +1,4 @@
-#	$OpenBSD: instbin.conf,v 1.19 1998/08/14 15:30:23 millert Exp $
+#	$OpenBSD: instbin.conf,v 1.20 1998/09/15 21:54:43 deraadt Exp $
 #
 # instbin.conf - unified binary for the inst/upgr floppies
 #
@@ -6,12 +6,12 @@
 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 chat chmod chown cp dd df disklabel ed
+progs cat chmod chown cp dd df disklabel dhclient 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 ksh ping pppd pwd reboot rm route
-progs scsi sed slattach sleep stty sync test tip umount
+progs mv newfs pax ksh ping pwd reboot rm route
+progs scsi sed sleep stty sync test tip umount
 progs rsh restore gzip sort grep cut installboot
 
 ln chown chgrp
diff --git a/distrib/i386/floppies/ramdisk/list b/distrib/i386/floppies/ramdisk/list
index 34c26e0f624..fc2691c1b7c 100644
--- a/distrib/i386/floppies/ramdisk/list
+++ b/distrib/i386/floppies/ramdisk/list
@@ -1,4 +1,4 @@
-#	$OpenBSD: list,v 1.15 1998/03/30 20:47:25 deraadt Exp $
+#	$OpenBSD: list,v 1.16 1998/09/15 21:54:44 deraadt Exp $
 
 # copy the crunched binary, link to it, and kill it
 COPY	${OBJDIR}/instbin	instbin
@@ -23,6 +23,7 @@ LINK	instbin			bin/stty
 LINK	instbin			bin/sync
 LINK	instbin			bin/test bin/[
 LINK	instbin			sbin/disklabel
+LINK	instbin			sbin/dhclient
 LINK	instbin			sbin/fdisk
 LINK	instbin			sbin/fsck sbin/fsck_ffs
 LINK	instbin			sbin/halt sbin/reboot
@@ -40,7 +41,6 @@ LINK	instbin			sbin/newfs sbin/mount_mfs
 LINK	instbin			sbin/ping
 LINK	instbin			sbin/restore
 LINK	instbin			sbin/route
-LINK	instbin			sbin/slattach
 LINK	instbin			sbin/scsi
 LINK	instbin			sbin/umount
 LINK	instbin			usr/bin/cut
@@ -51,9 +51,7 @@ LINK	instbin			usr/bin/less usr/bin/more
 LINK	instbin			usr/bin/rsh
 LINK	instbin			usr/bin/sed
 LINK	instbin			usr/bin/sort
-LINK	instbin			usr/sbin/chat
 LINK	instbin			usr/sbin/chown usr/sbin/chgrp
-LINK	instbin			usr/sbin/pppd
 LINK	instbin			usr/mdec/installboot
 SPECIAL	/bin/rm instbin
 
@@ -81,7 +79,9 @@ SYMLINK	/tmp/fstab.shadow		etc/fstab
 SYMLINK	/tmp/resolv.conf.shadow		etc/resolv.conf
 SYMLINK	/tmp/hosts			etc/hosts
 
-COPYDIR	${DESTDIR}/etc/ppp		etc/ppp
+# dhcp things
+COPY	${DESTDIR}/etc/dhclient.conf	etc/dhclient.conf
+COPY	${DESTDIR}/etc/dhclient-script etc/dhclient-script
 
 # and the common installation tools
 COPY	${CURDIR}/termcap.pcvt	usr/share/misc/termcap
diff --git a/distrib/i386/floppies/ramdisk/mtree.conf b/distrib/i386/floppies/ramdisk/mtree.conf
index fafd2133b9c..6bd4684b711 100644
--- a/distrib/i386/floppies/ramdisk/mtree.conf
+++ b/distrib/i386/floppies/ramdisk/mtree.conf
@@ -1,4 +1,4 @@
-#	$OpenBSD: mtree.conf,v 1.4 1997/05/08 06:24:39 tholo Exp $
+#	$OpenBSD: mtree.conf,v 1.5 1998/09/15 21:54:44 deraadt Exp $
 
 /set type=dir uname=root gname=wheel mode=0755
 # .
@@ -91,5 +91,11 @@ tmp		mode=0177
 # ./var/tmp
 ..
 
+# ./var/db
+db		mode=0177
+
+# ./var/db
+..
+
 # ./var
 ..