Kill rd.group, rd.master.passwd, rd.disktab; use DESTDIR ones instead.

Also copy in protocols and services
Remove links to kill, pwd, test, and [ to match raminst.conf
Add link for dhclient as it was added to raminst.conf

4 files changed, 65 insertions, 293 deletions

diff --git a/distrib/hp300/ramdisk/list b/distrib/hp300/ramdisk/list
index 9d48ba13ce7..0f4436a0b12 100644
--- a/distrib/hp300/ramdisk/list
+++ b/distrib/hp300/ramdisk/list
@@ -1,81 +1,79 @@
-#	$OpenBSD: list,v 1.14 1999/09/27 06:00:23 downsj Exp $
+#	$OpenBSD: list,v 1.15 2000/05/07 02:15:12 millert Exp $
 
 COPY	${OBJDIR}/raminst		raminst
-LINK	raminst			bin/cat
-LINK	raminst			bin/chmod
-LINK	raminst			bin/cp
-LINK	raminst			bin/df
-LINK	raminst			bin/dd
-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/pwd
-LINK	raminst			bin/rm
-LINK	raminst			bin/sh
-LINK	bin/sh			bin/-sh
-LINK	raminst			bin/sleep
-LINK	raminst			bin/stty
-LINK	raminst			bin/sync
-LINK	raminst			bin/test
-LINK	raminst			bin/[
-LINK	raminst			sbin/disklabel
-LINK	raminst			sbin/fsck
-LINK	raminst			sbin/halt
-LINK	raminst			sbin/ifconfig
-LINK	raminst			sbin/init
-LINK	raminst			sbin/mknod
-LINK	raminst			usr/bin/more
-LINK	raminst			sbin/mount
-LINK	raminst			sbin/mount_cd9660
-LINK	raminst			sbin/mount_ffs
-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/ftp
-LINK	raminst			usr/bin/egrep
-LINK	raminst			usr/bin/grep
-LINK	raminst			usr/bin/gzip
-LINK	raminst			usr/bin/less
-LINK	raminst			usr/bin/sed
-LINK	raminst			usr/bin/sort
-LINK	raminst			bin/pax
-LINK	raminst			usr/bin/tar
-LINK	raminst			usr/bin/tip
-LINK	raminst			usr/sbin/chat
-LINK	raminst			usr/sbin/chown
-LINK	raminst			usr/sbin/pppd
-LINK	raminst			usr/bin/vi
+LINK	raminst				bin/cat
+LINK	raminst				bin/chmod
+LINK	raminst				bin/cp
+LINK	raminst				bin/df
+LINK	raminst				bin/dd
+LINK	raminst				bin/ed
+LINK	raminst				bin/expr
+LINK	raminst				bin/ln
+LINK	raminst				bin/ls
+LINK	raminst				bin/hostname
+LINK	raminst				bin/mkdir
+LINK	raminst				bin/mv
+LINK	raminst				bin/rm
+LINK	raminst				bin/sh
+LINK	bin/sh				bin/-sh
+LINK	raminst				bin/sleep
+LINK	raminst				bin/stty
+LINK	raminst				bin/sync
+LINK	raminst				sbin/disklabel
+LINK	raminst				sbin/fsck
+LINK	raminst				sbin/halt
+LINK	raminst				sbin/ifconfig
+LINK	raminst				sbin/init
+LINK	raminst				sbin/mknod
+LINK	raminst				usr/bin/more
+LINK	raminst				sbin/mount
+LINK	raminst				sbin/mount_cd9660
+LINK	raminst				sbin/mount_ffs
+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/ftp
+LINK	raminst				usr/bin/egrep
+LINK	raminst				usr/bin/grep
+LINK	raminst				usr/bin/gzip
+LINK	raminst				usr/bin/less
+LINK	raminst				usr/bin/sed
+LINK	raminst				usr/bin/sort
+LINK	raminst				bin/pax
+LINK	raminst				usr/bin/tar
+LINK	raminst				usr/bin/tip
+LINK	raminst				usr/sbin/chat
+LINK	raminst				usr/sbin/chown
+LINK	raminst				usr/sbin/pppd
+LINK	raminst				usr/bin/vi
+LINK	raminst				sbin/dhclient
 SPECIAL	/bin/rm raminst
 
 # copy the MAKEDEV script and make some devices
-COPY	${DESTDIR}/dev/MAKEDEV	dev/MAKEDEV
+COPY	${DESTDIR}/dev/MAKEDEV		dev/MAKEDEV
 SPECIAL	cd dev; sh MAKEDEV raminst
 
 # we need the contents of /usr/mdec (XXX)
 COPY	${DESTDIR}/usr/mdec/uboot.lif	usr/mdec/uboot.lif
-LINK	usr/mdec/uboot.lif	usr/mdec/bootct
-LINK	usr/mdec/uboot.lif	usr/mdec/boothd
-LINK	usr/mdec/uboot.lif	usr/mdec/bootsd
-LINK	usr/mdec/uboot.lif	usr/mdec/ctboot
-LINK	usr/mdec/uboot.lif	usr/mdec/hdboot
-LINK	usr/mdec/uboot.lif	usr/mdec/sdboot
+LINK	usr/mdec/uboot.lif		usr/mdec/bootct
+LINK	usr/mdec/uboot.lif		usr/mdec/boothd
+LINK	usr/mdec/uboot.lif		usr/mdec/bootsd
+LINK	usr/mdec/uboot.lif		usr/mdec/ctboot
+LINK	usr/mdec/uboot.lif		usr/mdec/hdboot
+LINK	usr/mdec/uboot.lif		usr/mdec/sdboot
 
 # various files that we need in /etc for the install
-COPY	rd.group		etc/group
-COPY	rd.master.passwd	etc/master.passwd
-COPY	rd.disktab		etc/disktab
-SPECIAL	cd etc; pwd_mkdb -p -d `pwd` `pwd`/master.passwd
+COPY	${DESTDIR}/etc/group		etc/group
+COPY	${DESTDIR}/etc/spwd.db		etc/spwd.db
+COPY	${DESTDIR}/etc/protocols	etc/protocols
+COPY	${DESTDIR}/etc/services		etc/services
+SPECIAL	sed -e '/^#[ 	].*$/d' < ${DESTDIR}/etc/disktab > etc/disktab
 
 # we strip comments from files since we need the space...
 
diff --git a/distrib/hp300/ramdisk/rd.disktab b/distrib/hp300/ramdisk/rd.disktab
deleted file mode 100644
index 08b9a1daae2..00000000000
--- a/distrib/hp300/ramdisk/rd.disktab
+++ /dev/null
@@ -1,198 +0,0 @@
-#	$OpenBSD: rd.disktab,v 1.1 1997/04/21 08:15:55 downsj Exp $
-rdroot|ramdiskroot|RAM-disk root FS image:\
-	:ty=simulated:se#512:nc#16:nt#2:ns#128:\
-	:ta=4.4BSD:oa#0:pa#4096:fa#512:ba#4096\
-	:ob#0:pb#0:oc#0:pc#4096:
-hd7945|hd7946|hd7945A|hd7946A|HP7945A|HP7946A:\
-	:ty=winchester:ns#16:nt#7:nc#968:\
-	:pa#15904:ba#8192:fa#1024:\
-	:pb#20160:\
-	:pc#108416:bc#4096:fc#1024:\
-	:pd#40320:\
-	:pg#72240:bg#4096:fg#512:\
-	:ph#52080:bh#4096:fh#512:
-hd7957|hd7957A|HP7957A:\
-	:ty=winchester:ns#22:nt#7:nc#1036:\
-	:pa#16016:ba#8192:fa#1024:\
-	:pb#24640:\
-	:pc#159544:bc#4096:fc#1024:\
-	:pd#42350:\
-	:pe#54824:be#4096:fe#512:\
-	:pf#46200:bf#4096:ff#1024:\
-	:pg#118734:bg#4096:fg#1024:\
-	:ph#101024:bh#4096:fh#1024:
-hd7958|hd7958A|HP7958A:\
-	:ty=winchester:ns#36:nt#7:nc#1013:\
-	:pa#16128:ba#8192:fa#1024:\
-	:pb#32256:\
-	:pc#255276:bc#4096:fc#1024:\
-	:pd#48384:\
-	:pe#100800:be#4096:fe#512:\
-	:pf#89712:bf#4096:ff#1024:\
-	:pg#206640:bg#4096:fg#1024:\
-	:ph#190512:bh#4096:fh#1024:
-hd7933|hd7933H|HP7933H:\
-	:ty=winchester:ns#46:nt#13:nc#1321:\
-	:pa#16146:ba#8192:fa#1024:\
-	:pb#66976:\
-	:pc#789958:bc#4096:fc#1024:\
-	:pd#16146:bd#8192:fd#1024:\
-	:pe#165646:be#4096:fe#1024:\
-	:pf#165646:bf#4096:ff#1024:\
-	:pg#706238:bg#4096:fg#1024:\
-	:ph#358800:bh#4096:fh#1024:
-hd7937|hd7937H|HP7937H:\
-	:ty=winchester:ns#123:nt#13:nc#698:\
-	:pa#15990:ba#8192:fa#1024:\
-	:pb#67158:\
-	:pc#1116102:bc#4096:fc#1024:\
-	:pd#15990:bd#8192:fd#1024:\
-	:pe#246246:be#4096:fe#1024:\
-	:pf#246246:bf#4096:ff#1024:\
-	:pg#1031355:bg#4096:fg#512:\
-	:ph#522873:bh#4096:fh#1024:
-hd9134|hd9134L|HP9134L:\
-	:ty=winchester:ns#16:nt#5:nc#973:\
-	:pa#15920:ba#8192:fa#1024:\
-	:pb#20000:\
-	:pc#77840:bc#4096:fc#1024\
-	:pd#32000:\
-	:pg#41840:bg#4096:fg#512:\
-	:ph#29840:bh#4096:fh#512:
-hd7936|hd7937H|HP7936H:\
-	:ty=winchester:ns#123:nt#7:nc#698:\
-	:pa#16359:ba#8192:fa#1024:\
-	:pb#67158:\
-	:pc#600978:bc#4096:fc#1024:\
-	:pd#16359:bd#8192:fd#1024:\
-	:pe#120540:be#4096:fe#1024:\
-	:pf#120540:bf#4096:ff#1024:\
-	:pg#516600:bg#4096:fg#512:\
-	:ph#259161:bh#4096:fh#1024
-hd7957B|HP7957B:\
-	:ty=winchester:ns#18:nt#7:nc#1269:\
-	:pa#16002:ba#8192:fa#1024:\
-	:pb#32760:\
-	:pc#159894:bc#4096:fc#1024:\
-	:pd#49140:\
-	:pe#50400:be#4096:fe#512:\
-	:pf#44226:bf#4096:ff#1024:\
-	:pg#111006:bg#4096:fg#1024:\
-	:ph#94626:bh#4096:fh#1024:
-hd7958B|hd7962|hd7962B|HP7958B|HP7962B:\
-	:ty=winchester:ns#42:nt#9:nc#786:\
-	:pa#16254:ba#8192:fa#1024:\
-	:pb#32886:\
-	:pc#297108:bc#4096:fc#1024:\
-	:pd#49140:\
-	:pe#121716:be#4096:fe#512:\
-	:pf#109620:bf#4096:ff#1024:\
-	:pg#247590:bg#4096:fg#1024:\
-	:ph#231336:bh#4096:fh#1024:
-hd7959B|hd7963|hd7963B|HP7959B|HP7963B:\
-	:ty=winchester:ns#42:nt#9:nc#1572:\
-	:pa#16254:ba#8192:fa#1024:\
-	:pb#49140:\
-	:pc#594216:bc#4096:fc#1024:\
-	:pd#65772:\
-	:pe#303912:be#4096:fe#512:\
-	:pf#207900:bf#4096:ff#1024:\
-	:pg#528444:bg#4096:fg#1024:\
-	:ph#511812:bh#4096:fh#1024:
-hd335H|hd335|HP2200A|2200A|HP335H|HP6000/335H:\
-	:ty=winchester:ns#113:nt#4:nc#1449:\
-	:pa#16272:ba#8192:fa#1024:\
-	:pb#49720:\
-	:pc#654948:bc#4096:fc#1024:\
-	:pd#65992:\
-	:pe#304648:be#4096:fe#512:\
-	:pf#267584:bf#4096:ff#1024:\
-	:pg#588504:bg#4096:fg#1024:\
-	:ph#572232:bh#4096:fh#1024:
-hd670H|hd670|HP2203A|2203A|HP670H|HP6000/670H:\
-	:ty=winchester:ns#113:nt#8:nc#1449:\
-	:pa#16272:ba#8192:fa#1024:\
-	:pb#67800:\
-	:pc#1309896:bc#4096:fc#1024:\
-	:pd#16272:\
-	:pe#305552:be#4096:fe#512:\
-	:pf#305552:bf#4096:ff#1024:\
-	:pg#1224920:bg#4096:fg#1024:\
-	:ph#597544:bh#4096:fh#1024:
-# Antiques
-hd9134D|HP9134D:\
-	:ty=winchester:ns#16:nt#6:nc#303:\
-	:pa#15936:ba#8192:fa#1024:\
-	:pb#13056:\
-	:pc#29088:bc#8192:fc#1024:
-hd9122|hd9122S|hd9122D|HP9122S|HP9122D:\
-	:ty=winchester:ns#8:nt#2:nc#77:\
-	:pc#1232:bc#8192:fc#1024:
-hd7912|hd7912P|HP7912P:\
-	:ty=winchester:ns#32:nt#7:nc#572:\
-	:pa#15904:ba#8192:fa#1024:\
-	:pb#22400:\
-	:pc#128128:bc#4096:fc#1024:\
-	:pd#42560:\
-	:pg#89600:bg#4096:fg#1024:\
-	:ph#69440:bh#4096:fh#1024:
-hd7914|hd7914P|hd7914CT|HP7914P|HP7914CT:\
-	:ty=winchester:ns#32:nt#7:nc#1152:\
-	:pa#15904:ba#8192:fa#1024:\
-	:pb#40320:\
-	:pc#258048:bc#4096:fc#1024:\
-	:pd#64960:\
-	:pe#98560:be#4096:fe#512:\
-	:pf#78400:bf#4096:ff#1024:\
-	:pg#201600:bg#4096:fg#1024:\
-	:ph#176960:bh#4096:fh#1024:
-#
-sd7958|sd7958-utah|HP7958S:\
-	:ty=winchester:ns#32:nt#6:nc#1643:\
-	:pa#16384:oa#1024:ba#8192:fa#1024:\
-	:pb#65536:ob#17408:\
-	:pc#315455:oc#0:bc#8192:fc#1024:\
-	:pd#98304:od#17408:\
-	:pe#102400:oe#115712:be#4096:fe#512:\
-	:pf#97343:of#218112:bf#4096:ff#1024:\
-	:pg#232511:og#82944:bg#8192:fg#1024:\
-	:ph#199743:oh#115712:bh#8192:fh#1024:
-sd7959|sd330|sd7959-utah|HP7959S:\
-	:ty=winchester:ns#32:nt#12:nc#1643:\
-	:pa#16384:oa#1024:ba#8192:fa#1024:\
-	:pb#65536:ob#17408:\
-	:pc#630911:oc#0:bc#8192:fc#1024:\
-	:pd#98304:od#17408:\
-	:pe#102400:oe#115712:be#4096:fe#512:\
-	:pf#412799:of#218112:bf#4096:ff#1024:\
-	:pg#547967:og#82944:bg#8192:fg#1024:\
-	:ph#515199:oh#115712:bh#8192:fh#1024:
-sd7548-utah|sd660|HP97548S with Utah partitions:\
-	:ty=winchester:ns#56:nt#16:nc#1447:\
-	:pa#16384:oa#1024:ba#8192:fa#1024:\
-	:pb#65536:ob#17408:\
-	:pc#1296511:oc#0:bc#8192:fc#1024:\
-	:pd#98304:od#17408:\
-	:pe#102400:oe#115712:be#4096:fe#512:\
-	:pf#1078399:of#218112:bf#4096:ff#1024:\
-	:pg#1213567:og#82944:bg#8192:fg#1024:\
-	:ph#1180799:oh#115712:bh#8192:fh#1024:
-# HP magneto-optical drive.
-sd650-sony|mo650-sony|HP6300/650A Magneto-optical drive with Sony format:\
-	:ty=optical:ns#61:nt#8:nc#1306:\
-	:pa#16384:oa#1024:ba#8192:fa#1024:\
-	:pb#65536:ob#17408:\
-	:pc#637328:oc#0:bc#8192:fc#1024:\
-	:pd#98304:od#17408:\
-	:pe#102400:oe#115712:be#4096:fe#1024:\
-	:pf#419216:of#218112:bf#4096:ff#1024:\
-	:pg#554384:og#82944:bg#8192:fg#1024:
-sd650|mo650|mo650-ansi|HP6300/650A Magneto-optical with ANSI format drive:\
-	:ty=optical:ns#61:nt#8:nc#1306:\
-	:pa#16384:oa#1024:ba#8192:fa#1024:\
-	:pb#65536:ob#17408:\
-	:pc#629136:oc#0:bc#8192:fc#1024:\
-	:pd#98304:od#17408:\
-	:pe#102400:oe#115712:be#4096:fe#1024:\
-	:pf#411024:of#218112:bf#4096:ff#1024:\
-	:pg#546192:og#82944:bg#8192:fg#1024:
diff --git a/distrib/hp300/ramdisk/rd.group b/distrib/hp300/ramdisk/rd.group
deleted file mode 100644
index 822e2cb3dfa..00000000000
--- a/distrib/hp300/ramdisk/rd.group
+++ /dev/null
@@ -1,20 +0,0 @@
-wheel:*:0:
-daemon:*:1:
-kmem:*:2:
-sys:*:3:
-tty:*:4:
-operator:*:5:
-bin:*:7:
-news:*:8:
-wsrc:*:9:
-users:*:10:
-games:*:13:
-staff:*:20:
-guest:*:31:
-utmp:*:45:
-www:*:67:
-network:*:69:
-named:*:70:
-dialer:*:117:
-nogroup:*:32766:
-nobody:*:32767:
diff --git a/distrib/hp300/ramdisk/rd.master.passwd b/distrib/hp300/ramdisk/rd.master.passwd
deleted file mode 100644
index faf490d38e5..00000000000
--- a/distrib/hp300/ramdisk/rd.master.passwd
+++ /dev/null
@@ -1,8 +0,0 @@
-root::0:0::0:0::/root:/bin/csh
-daemon:*:1:31::0:0::/root:/sbin/nologin
-operator:*:2:5::0:0::/operator:/sbin/nologin
-bin:*:3:7::0:0::/:/sbin/nologin
-uucp:*:66:1::0:0::/var/spool/uucppublic:/usr/libexec/uucp/uucico
-www:*:67:67::0:0::/var/www:/sbin/nologin
-named:*:70:70::0:0::/var/named:/sbin/nologin
-nobody:*:32767:32767::0:0::/nonexistent:/sbin/nologin