alpha ramdisk has dhcp support now too

5 files changed, 19 insertions, 24 deletions

diff --git a/distrib/alpha/inst-common/list b/distrib/alpha/inst-common/list
index 052a0452472..9bdf716ae7e 100644
--- a/distrib/alpha/inst-common/list
+++ b/distrib/alpha/inst-common/list
@@ -1,5 +1,5 @@
 #
-#	$OpenBSD: list,v 1.10 1998/06/09 08:34:16 deraadt Exp $
+#	$OpenBSD: list,v 1.11 1998/09/21 23:22:54 deraadt Exp $
 #
 
 # copy the crunched binary, link to it, and kill it
@@ -14,41 +14,32 @@ LINK	raminst			bin/ed
 LINK	raminst			bin/expr
 LINK	raminst			bin/ln
 LINK	raminst			bin/ls
-#LINK	raminst			bin/kill
-#LINK	raminst			bin/hostname
 LINK	raminst			bin/mkdir
 LINK	raminst			bin/mv
 LINK	raminst			bin/ksh bin/sh
 ARGVLINK ksh			-sh
-#LINK	raminst			bin/pwd
 LINK	raminst			bin/rm
 LINK	raminst			bin/stty
 LINK	raminst			bin/sleep
-#LINK	raminst			bin/sync
 LINK	raminst			bin/tar
-#LINK	raminst			bin/test
-#LINK	raminst			bin/[
 LINK	raminst			sbin/disklabel
-#LINK	raminst			sbin/fdisk
 LINK	raminst			sbin/fsck
 LINK	raminst			sbin/halt
+LINK	raminst			sbin/dhclient
 LINK	raminst			sbin/ifconfig
 LINK	raminst			sbin/init
 LINK	raminst			sbin/mknod
 LINK	raminst			sbin/mount
 LINK	raminst			sbin/mount_cd9660
 LINK	raminst			sbin/mount_ffs
-#LINK	raminst			sbin/mount_msdos
 LINK	raminst			sbin/mount_kernfs
 LINK	raminst			sbin/mount_nfs
 LINK	raminst			sbin/mount_mfs
 LINK	raminst			sbin/newfs
 LINK	raminst			sbin/reboot
 LINK	raminst			sbin/route
-#LINK	raminst			sbin/slattach
 LINK	raminst			sbin/umount
 LINK	raminst			usr/bin/chgrp
-#LINK	raminst			usr/bin/cut
 LINK	raminst			usr/bin/ftp
 LINK	raminst			usr/bin/egrep
 LINK	raminst			usr/bin/fgrep
@@ -57,9 +48,7 @@ LINK	raminst			usr/bin/gzip
 LINK	raminst			usr/bin/less
 LINK	raminst			usr/bin/more
 LINK	raminst			usr/bin/sed
-#LINK	raminst			usr/bin/sort
 LINK	raminst			usr/bin/pax
-#LINK	raminst			usr/bin/tip
 LINK	raminst			usr/sbin/chown
 LINK	raminst			usr/mdec/installboot
 SPECIAL	/bin/rm raminst
@@ -74,10 +63,7 @@ COPY	${DESTDIR}/usr/mdec/bootxx	usr/mdec/bootxx
 
 # various files that we need in /etc for the install
 COPY	${DESTDIR}/etc/group		etc
-COPY	${DESTDIR}/etc/master.passwd	etc
-COPY	${DESTDIR}/etc/passwd		etc
 COPY	${DESTDIR}/etc/protocols	etc
-COPY	${DESTDIR}/etc/pwd.db		etc
 COPY	${DESTDIR}/etc/services		etc
 COPY	${DESTDIR}/etc/spwd.db		etc
 
diff --git a/distrib/alpha/ramdisk/list b/distrib/alpha/ramdisk/list
index 2c3047de177..2843fa2c357 100644
--- a/distrib/alpha/ramdisk/list
+++ b/distrib/alpha/ramdisk/list
@@ -1,9 +1,9 @@
-#	$OpenBSD: list,v 1.6 1998/04/28 16:28:01 millert Exp $
+#	$OpenBSD: list,v 1.7 1998/09/21 23:22:57 deraadt Exp $
 
 # we strip comments from files since we need the space...
 
 # the disktab explanation file
-SPECIAL	sed -e '/^#[ 	].*$/d' < ${CURDIR}/disktab.preinstall > etc/disktab.preinstall
+#SPECIAL sed -e '/^#[ 	].*$/d' < ${CURDIR}/disktab.preinstall > etc/disktab.preinstall
 
 # and the installation tools
 SPECIAL	sed -e '/^#[ 	].*$/d' < ${CURDIR}/dot.profile > .profile
diff --git a/distrib/alpha/ramdisk/raminst.conf b/distrib/alpha/ramdisk/raminst.conf
index 0bdd0706ee5..16f86c6d318 100644
--- a/distrib/alpha/ramdisk/raminst.conf
+++ b/distrib/alpha/ramdisk/raminst.conf
@@ -1,5 +1,5 @@
 #
-#	$OpenBSD: raminst.conf,v 1.12 1998/06/25 16:35:43 millert Exp $
+#	$OpenBSD: raminst.conf,v 1.13 1998/09/21 23:22:57 deraadt Exp $
 #
 # ram.conf - unified binary for the RAM disk
 #
@@ -10,7 +10,7 @@ srcdirs gnu/usr.bin sys/arch/alpha/stand
 progs cat chmod chown cp dd df disklabel ed grep fsck_ffs ftp 
 progs gzip ifconfig init installboot less ln ls mkdir mknod mount
 progs mount_cd9660 mount_kernfs mount_ffs mount_nfs mv newfs ksh
-progs reboot rm route rsh sed sleep stty pax umount
+progs reboot rm route rsh sed sleep stty pax umount dhclient
 #progs slattach sync tip
 
 ln chown chgrp
diff --git a/distrib/ramdisk/list b/distrib/ramdisk/list
index 24db998b66e..9d138026208 100644
--- a/distrib/ramdisk/list
+++ b/distrib/ramdisk/list
@@ -1,4 +1,4 @@
-#	$OpenBSD: list,v 1.6 1997/12/02 02:30:34 deraadt Exp $
+#	$OpenBSD: list,v 1.7 1998/09/21 23:23:00 deraadt Exp $
 #	$NetBSD: list,v 1.4.4.1 1996/06/20 20:30:26 pk Exp $
 
 SRCDIRS distrib/special
@@ -31,6 +31,7 @@ LINK	instbin			bin/test bin/[
 LINK	instbin			sbin/fsck_ffs sbin/fsck
 LINK	instbin			sbin/reboot sbin/halt
 LINK	instbin			sbin/ifconfig
+LINK	instbin			sbin/dhclient
 LINK	instbin			sbin/init
 LINK	instbin			sbin/mknod
 LINK	instbin			sbin/mount
@@ -41,13 +42,12 @@ LINK	instbin			sbin/mount_kernfs
 LINK	instbin			sbin/newfs sbin/mount_mfs
 LINK	instbin			sbin/ping
 LINK	instbin			sbin/route
-LINK	instbin			sbin/slattach
 LINK	instbin			sbin/umount
 SYMLINK	../../instbin		usr/sbin/chown usr/bin/chgrp
 SYMLINK	../../instbin		usr/bin/ftp
 SYMLINK	../../instbin		usr/bin/gzip usr/bin/gunzip usr/bin/gzcat
 SYMLINK	../../instbin		usr/bin/sed
-SYMLINK	../../instbin		usr/bin/build usr/bin/vi
+#SYMLINK	../../instbin		usr/bin/build usr/bin/vi
 
 ARGVLINK ksh		-sh
 
@@ -63,3 +63,7 @@ COPY	${CURDIR}/../miniroot/install.sh		install
 COPY	${CURDIR}/../miniroot/upgrade.sh		upgrade
 SPECIAL sed "/^VERSION=/s/=.*/=${REV}/" < ${CURDIR}/../miniroot/install.sub > install.sub
 SPECIAL	chmod 755 install upgrade
+
+# dhcp things
+COPY	${CURDIR}/../miniroot/dhclient.conf etc/dhclient.conf
+COPY	${DESTDIR}/sbin/dhclient-script sbin/dhclient-script
diff --git a/distrib/ramdisk/mtree.conf b/distrib/ramdisk/mtree.conf
index ee15902a700..db22942c3ba 100644
--- a/distrib/ramdisk/mtree.conf
+++ b/distrib/ramdisk/mtree.conf
@@ -1,4 +1,4 @@
-#	$OpenBSD: mtree.conf,v 1.2 1997/05/15 00:11:15 deraadt Exp $
+#	$OpenBSD: mtree.conf,v 1.3 1998/09/21 23:23:00 deraadt Exp $
 #	$NetBSD: mtree.conf,v 1.1.4.2 1996/07/15 06:29:38 leo Exp $
 
 /set type=dir uname=root gname=wheel mode=0755
@@ -80,5 +80,10 @@ misc
 # ./var
 var
 
+# ./var/db
+db
+# ./var/db
+..
+
 # ./
 ..