Change to crunched ramdisk

6 files changed, 116 insertions, 121 deletions

diff --git a/distrib/arc/ramdisk/Makefile b/distrib/arc/ramdisk/Makefile
index 91d5d58a12a..d1fc9e98c09 100644
--- a/distrib/arc/ramdisk/Makefile
+++ b/distrib/arc/ramdisk/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.3 1997/05/18 13:40:50 pefo Exp $
+#	$OpenBSD: Makefile,v 1.4 1997/05/19 10:33:19 pefo Exp $
 
 # NOTE! We don't do crunched yet!
 
@@ -23,7 +23,7 @@ REALIMAGE!=	echo /tmp/image.${PID}
 
 
 DISKTYPE=       rdroot
-NBLKS=          20000
+NBLKS=          8192
 # minfree, opt, b/i  trks, sects, cpg
 NEWFSARGS= -m 0 -o space -c 16 -i 4096
 
@@ -35,7 +35,7 @@ all ${IMAGE}:
 
 all:	${BSD_RD}
 
-${BSD_RD}: ${IMAGE} bsd rdsetroot
+${BSD_RD}: ${CBIN} ${IMAGE} bsd rdsetroot
 	cp bsd ${BSD_RD}.elf
 	${.OBJDIR}/rdsetroot ${BSD_RD}.elf < ${IMAGE}
 	elf2ecoff ${BSD_RD}.elf ${BSD_RD}
@@ -83,14 +83,14 @@ install:
 	cp ${BSD_RD} ${DESTDIR}/snapshot/${BSD_RD}
 
 ${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF}
-	crunchgen -D ${BSDSRCDIR} -L ${DESTDIR}/usr/lib ${CRUNCHCONF}
+	crunchgen -E -D ${BSDSRCDIR} -L ${DESTDIR}/usr/lib ${CRUNCHCONF}
 
 ${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c
 	make -f ${CBIN}.mk all
 
 do_files:
 	mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u
-	TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${DESTDIR} \
+	TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \
 	    REV=${REV} TARGDIR=${MOUNT_POINT} sh ${TOP}/runlist.sh ${LISTS}
 
 clean cleandir:
diff --git a/distrib/arc/ramdisk/dot.profile b/distrib/arc/ramdisk/dot.profile
index 044ff8cf302..be0a0925151 100644
--- a/distrib/arc/ramdisk/dot.profile
+++ b/distrib/arc/ramdisk/dot.profile
@@ -1,4 +1,4 @@
-#       $OpenBSD: dot.profile,v 1.1 1997/05/14 20:52:44 pefo Exp $
+#       $OpenBSD: dot.profile,v 1.2 1997/05/19 10:33:20 pefo Exp $
 #
 # Copyright (c) 1994 Christopher G. Demetriou
 # All rights reserved.
@@ -46,8 +46,6 @@ if [ "X${DONEPROFILE}" = "X" ]; then
 
 	mount /dev/rd0a /
 
-	ldconfig
-
 	# mount the kern_fs so that we can examine the dmesg state
 	mount -t kernfs /kern /kern
 
diff --git a/distrib/arc/ramdisk/install.md b/distrib/arc/ramdisk/install.md
index 4d5d4b18e17..31fc27a967f 100644
--- a/distrib/arc/ramdisk/install.md
+++ b/distrib/arc/ramdisk/install.md
@@ -1,4 +1,4 @@
-#	$OpenBSD: install.md,v 1.3 1997/05/18 13:40:52 pefo Exp $
+#	$OpenBSD: install.md,v 1.4 1997/05/19 10:33:20 pefo Exp $
 #
 #
 # Copyright rc) 1996 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
 #
 
 # Machine-dependent install sets
-MDSETS="kern"
+MDSETS="kernel"
 
 md_set_term() {
 	if [ ! -z "$TERM" ]; then
@@ -72,7 +72,7 @@ md_get_cddevs() {
 
 md_get_ifdevs() {
 	# return available network devices
-	cat /kern/msgbuf | egrep "^(e[dglp][0-9] |[dil]e[0-9] |f[ep]a[0-9] )" | cut -d" " -f1 | sort -u
+	cat /kern/msgbuf | egrep "^(sn[0-9] |e[dglp][0-9] |[dil]e[0-9] |f[ep]a[0-9] )" | cut -d" " -f1 | sort -u
 }
 
 md_get_partition_range() {
@@ -88,7 +88,6 @@ md_installboot() {
 	else
 		echo "Failed, you will not be able to boot from /dev/${1}."
 	fi
-	ldconfig
 }
 
 md_native_fstype() {
@@ -126,8 +125,8 @@ md_init_mbr() {
 		echo "It's completly normal. The disk has no label yet."
 		echo "This will take a minute or two..."
 		sleep 2
-		dd if=/usr/mdec/mbr of=/dev/$1c 2>&1 >/dev/null
-		gunzip < /usr/mdec/msdos5mb.gz | dd of=/dev/$1c bs=512 seek=32 2>&1 >/dev/null
+		dd if=/usr/mdec/mbr of=/dev/r$1c >/dev/null 2>&1
+		gunzip < /usr/mdec/msdos5mb.gz | dd of=/dev/r$1c bs=512 seek=32 >/dev/null 2>&1
 	;;
 	esac
 }
@@ -189,11 +188,11 @@ md_prep_fdisk()
 
 	_disk=$1
 	echo
-	echo "This disk has not previously been used with OpenBSD.  You may share"
+	echo "This disk has not previously been used with OpenBSD. You may share"
 	echo "this disk with other operating systems (probably Windows/NT or"
 	echo "maybe Linux/Mips etc.) Anyhow, to be able to boot the system you"
 	echo "will need a small DOS partition in the begining of the disk to"
-	echo "hold the bootable kernel. This has been take care of if you choosed"
+	echo "hold the bootable kernel. This has been taken care of if you choosed"
 	echo "to do that initialization just before."
 	echo
 	echo "WARNING: Wrong information in the BIOS partition table might"
@@ -214,11 +213,12 @@ md_prep_fdisk()
 		cat << \__md_prep_fdisk_1
 
 An OpenBSD partition should have type 166 (A6), and should be the only
-partition marked as active.  Furthermore, the partitions must NOT
-overlap each others.  fdisk will be started in update mode, and you
-will be able to add this information as needed.  If you make a mistake,
-exit fdisk without storing the new information, and you will be allowed
-to start over.
+partition marked as active. Also make sure that the size of the partition
+to be used by OpenBSD is correct, otherwise OpenBSD disklabel installation
+will fail. Furthermore, the partitions must NOT overlap each others. fdisk
+will be started in update mode, and you will be able to add this information
+as needed.  If you make a mistake, exit fdisk without storing the new
+information, and you will be allowed to start over.
 __md_prep_fdisk_1
 		echo -n "Press [Enter] to continue "
 		getresp ""
@@ -240,11 +240,10 @@ __md_prep_fdisk_1
 		esac
 	done
 
-	echo
 	echo "Please take note of the offset and size of the OpenBSD partition"
 	echo "*AND* the MSDOS partitions you may want to access from OpenBSD."
 	echo "At least the MSDOS partition used for booting must be accessible"
-	echo "by OpenBSD as partition 'i'. You will need this information to "
+	echo "by OpenBSD as partition 'i'. You may need this information to "
 	echo "fill in the OpenBSD disk label later."
 	echo -n "Press [Enter] to continue "
 	getresp ""
@@ -281,19 +280,16 @@ md_prep_disklabel()
 	# display example
 	cat << \__md_prep_disklabel_1
 
-Here is an example of what the partition information will look like once
+Here is an example of what the partition information may look like once
 you have entered the disklabel editor. Disk partition sizes and offsets
 are in sector (most likely 512 bytes) units. You may set these size/offset
 pairs on cylinder boundaries (the number of sector per cylinder is given
-in the `sectors/cylinder' entry, which is not shown here). Although this
-is not requiered. 
-
-Also, you *must* make sure that the 'd' partition points at the MSDOS
+in the `sectors/cylinder' entry, which is not shown here).
+Also, you *must* make sure that the 'i' partition points at the MSDOS
 partition that will be used for booting. The 'c' partition shall start
 at offset 0 and include the entire disk. This is most likely correct when
 you see the default label in the editor.
 
-
 Do not change any parameters except the partition layout and the label name.
 
 [Example]
@@ -302,14 +298,12 @@ Do not change any parameters except the partition layout and the label name.
   a:   120832    10240    4.2BSD     1024  8192    16   # (Cyl.   11*- 142*)
   b:   131072   131072      swap                        # (Cyl.  142*- 284*)
   c:  6265200        0    unused     1024  8192         # (Cyl.    0 - 6809)
-  d:    10208       32     MSDOS                        # (Cyl.    0*- 11*)
   e:   781250   262144    4.2BSD     1024  8192    16   # (Cyl.  284*- 1134*)
   f:  1205000  1043394    4.2BSD     1024  8192    16   # (Cyl. 1134*- 2443*)
   g:  2008403  2248394    4.2BSD     1024  8192    16   # (Cyl. 2443*- 4626*)
   h:  2008403  4256797    4.2BSD     1024  8192    16   # (Cyl. 4626*- 6809*)
   i:    10208       32     MSDOS                        # (Cyl.    0*- 11*)
 [End of example]
-
 __md_prep_disklabel_1
 	echo -n "Press [Enter] to continue "
 	getresp ""
diff --git a/distrib/arc/ramdisk/instbin.conf b/distrib/arc/ramdisk/instbin.conf
new file mode 100644
index 00000000000..6514b7da179
--- /dev/null
+++ b/distrib/arc/ramdisk/instbin.conf
@@ -0,0 +1,31 @@
+#	$OpenBSD: instbin.conf,v 1.1 1997/05/19 10:33:21 pefo 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 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 build
+progs scsi sed slattach sleep stty sync test tip umount
+progs rsh restore gzip sort grep cut elf2ecoff
+
+ln chown chgrp
+ln fsck_ffs fsck
+ln less more
+ln pax tar
+ln pax cpio
+ln pdksh sh
+ln pdksh -sh		# init invokes the shell this way
+ln test [
+ln reboot halt
+ln gzip gunzip
+ln grep egrep
+ln grep fgrep
+ln build vi
+
+libs -ledit -lutil -lcurses -lkrb -ldes -ll -lm -ltermlib
diff --git a/distrib/arc/ramdisk/list b/distrib/arc/ramdisk/list
index bd77ba1b087..343f543bf1c 100644
--- a/distrib/arc/ramdisk/list
+++ b/distrib/arc/ramdisk/list
@@ -1,81 +1,63 @@
-#	$OpenBSD: list,v 1.2 1997/05/18 13:40:54 pefo Exp $
+#	$OpenBSD: list,v 1.3 1997/05/19 10:33:21 pefo Exp $
 
 # copy the crunched binary, link to it, and kill it
-COPY	${OBJDIR}/bin/cat		bin/cat
-COPY	${OBJDIR}/bin/chmod		bin/chmod
-COPY	${OBJDIR}/bin/cp		bin/cp
-COPY	${OBJDIR}/bin/cpio		bin/cpio
-LINK	bin/cpio			bin/pax
-LINK	bin/cpio			bin/tar
-COPY	${OBJDIR}/bin/dd		bin/dd
-COPY	${OBJDIR}/bin/df		bin/df
-COPY	${OBJDIR}/bin/ed		bin/ed
-COPY	${OBJDIR}/bin/expr		bin/expr
-COPY	${OBJDIR}/bin/hostname		bin/hostname
-COPY	${OBJDIR}/bin/ln		bin/ln
-COPY	${OBJDIR}/bin/ls		bin/ls
-COPY	${OBJDIR}/bin/mkdir		bin/mkdir
-COPY	${OBJDIR}/bin/mv		bin/mv
-COPY	${OBJDIR}/bin/pwd		bin/pwd
-COPY	${OBJDIR}/bin/rm		bin/rm
-COPY	${OBJDIR}/bin/sh		bin/sh
-LINK	bin/sh				bin/pdksh
-COPY	${OBJDIR}/bin/sleep		bin/sleep
-COPY	${OBJDIR}/bin/stty		bin/stty
-COPY	${OBJDIR}/bin/sync		bin/sync
-COPY	${OBJDIR}/bin/test		bin/test
-LINK	bin/test			bin/[
-COPY	${OBJDIR}/sbin/disklabel	sbin/disklabel
-COPY	${OBJDIR}/sbin/fdisk		sbin/fdisk
-COPY	${OBJDIR}/sbin/fsck		sbin/fsck
-LINK	sbin/fsck			sbin/fsck_ffs
-COPY	${OBJDIR}/sbin/halt		sbin/halt
-LINK	sbin/halt			sbin/reboot
-COPY	${OBJDIR}/sbin/ifconfig		sbin/ifconfig
-COPY	${OBJDIR}/sbin/init		sbin/init
-COPY	${OBJDIR}/sbin/ldconfig		sbin/ldconfig
-COPY	${OBJDIR}/sbin/mknod		sbin/mknod
-COPY	${OBJDIR}/sbin/mount		sbin/mount
-COPY	${OBJDIR}/sbin/mount_cd9660	sbin/mount_cd9660
-COPY	${OBJDIR}/sbin/mount_ffs	sbin/mount_ffs
-COPY	${OBJDIR}/sbin/mount_msdos	sbin/mount_msdos
-COPY	${OBJDIR}/sbin/mount_nfs	sbin/mount_nfs
-COPY	${OBJDIR}/sbin/mount_kernfs	sbin/mount_kernfs
-#COPY	${OBJDIR}/sbin/mount_ext2fs	sbin/mount_ext2fs
-COPY	${OBJDIR}/sbin/newfs		sbin/newfs
-LINK	sbin/newfs			sbin/mount_mfs
-COPY	${OBJDIR}/sbin/ping		sbin/ping
-#COPY	${OBJDIR}/sbin/restore		sbin/restore
-COPY	${OBJDIR}/sbin/route		sbin/route
-#COPY	${OBJDIR}/sbin/slattach		sbin/slattach
-#COPY	${OBJDIR}/sbin/scsi		sbin/scsi
-COPY	${OBJDIR}/sbin/umount		sbin/umount
-COPY	${OBJDIR}/usr/bin/cut		usr/bin/cut
-COPY	${OBJDIR}/usr/bin/egrep		usr/bin/egrep
-COPY	${OBJDIR}/usr/bin/elf2ecoff	usr/bin/elf2ecoff
-LINK	usr/bin/egrep			usr/bin/fgrep
-LINK	usr/bin/egrep			usr/bin/grep
-COPY	${OBJDIR}/usr/bin/ftp		usr/bin/ftp
-COPY	${OBJDIR}/usr/bin/gzip		usr/bin/gzip
-LINK	usr/bin/gzip			usr/bin/gunzip
-LINK	usr/bin/gzip			usr/bin/gzcat
-COPY	${OBJDIR}/usr/bin/less		usr/bin/less
-LINK	usr/bin/less			usr/bin/more
-COPY	${OBJDIR}/usr/bin/rsh		usr/bin/rsh
-COPY	${OBJDIR}/usr/bin/sed		usr/bin/sed
-COPY	${OBJDIR}/usr/bin/sort		usr/bin/sort
-#COPY	${OBJDIR}/usr/bin/tip		usr/bin/tip
-COPY	${OBJDIR}/usr/bin/vi		usr/bin/vi
-#COPY	${OBJDIR}/usr/sbin/bad144	usr/sbin/bad144
-#COPY	${OBJDIR}/usr/sbin/chat		usr/sbin/chat
-COPY	${OBJDIR}/usr/sbin/chown	usr/sbin/chown usr/sbin/chgrp
-LINK	usr/sbin/chown			usr/sbin/chgrp
-#COPY	${OBJDIR}/usr/sbin/pppd		usr/sbin/pppd
-COPY	${OBJDIR}/usr/lib/libc.so.16.1	usr/lib/libc.so.16.1
-COPY	${OBJDIR}/usr/lib/libedit.so.0.0	usr/lib/libedit.so.0.0
-COPY	${OBJDIR}/usr/lib/libtermcap.so.0.0	usr/lib/libtermcap.so.0.0
-COPY	${OBJDIR}/usr/lib/libtermlib.so.2.0	usr/lib/libtermlib.so.2.0
-COPY	${OBJDIR}/usr/libexec/ld.so	usr/libexec/ld.so
+COPY	${OBJDIR}/instbin	instbin
+LINK	instbin			bin/cat
+LINK	instbin			bin/chmod
+LINK	instbin			bin/cp
+LINK	instbin			bin/cpio bin/pax bin/tar
+LINK	instbin			bin/dd
+LINK	instbin			bin/df
+LINK	instbin			bin/ed
+LINK	instbin			bin/expr
+LINK	instbin			bin/hostname
+LINK	instbin			bin/ln
+LINK	instbin			bin/ls
+LINK	instbin			bin/mkdir
+LINK	instbin			bin/mv
+LINK	instbin			bin/pwd
+LINK	instbin			bin/rm
+LINK	instbin			bin/sh bin/pdksh
+LINK	instbin			bin/sleep
+LINK	instbin			bin/stty
+LINK	instbin			bin/sync
+LINK	instbin			bin/test bin/[
+LINK	instbin			sbin/disklabel
+LINK	instbin			sbin/fdisk
+LINK	instbin			sbin/fsck sbin/fsck_ffs
+LINK	instbin			sbin/halt sbin/reboot
+LINK	instbin			sbin/ifconfig
+LINK	instbin			sbin/init
+LINK	instbin			sbin/mknod
+LINK	instbin			sbin/mount
+LINK	instbin			sbin/mount_cd9660
+LINK	instbin			sbin/mount_ffs
+LINK	instbin			sbin/mount_msdos
+LINK	instbin			sbin/mount_nfs
+LINK	instbin			sbin/mount_kernfs
+LINK	instbin			sbin/mount_ext2fs
+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
+LINK	instbin			usr/bin/egrep usr/bin/fgrep usr/bin/grep
+LINK	instbin			usr/bin/elf2ecoff
+LINK	instbin			usr/bin/ftp
+LINK	instbin			usr/bin/gzip usr/bin/gunzip usr/bin/gzcat
+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/bin/tip
+LINK	instbin			usr/bin/vi
+LINK	instbin			usr/sbin/chat
+LINK	instbin			usr/sbin/chown usr/sbin/chgrp
+LINK	instbin			usr/sbin/pppd
+SPECIAL	/bin/rm instbin
 
 # `internal' crunchgen links
 ARGVLINK sh		-sh
@@ -105,7 +87,7 @@ COPY	${DESTDIR}/usr/share/misc/scsi_modes	usr/share/misc/scsi_modes
 COPY	dot.profile			.profile
 COPY	dot.instutils			.instutils
 COPY	install.md			install.md
-COPY	${TOPDIR}/../miniroot/install.sh		install
-COPY	${TOPDIR}/../miniroot/upgrade.sh		upgrade
-SPECIAL sed "/^VERSION=/s/=.*/=${REV}/" < ${TOPDIR}/../miniroot/install.sub > install.sub
+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
diff --git a/distrib/arc/ramdisk/mtree.conf b/distrib/arc/ramdisk/mtree.conf
index e627c2204f3..381547d2f63 100644
--- a/distrib/arc/ramdisk/mtree.conf
+++ b/distrib/arc/ramdisk/mtree.conf
@@ -1,4 +1,4 @@
-#	$OpenBSD: mtree.conf,v 1.1 1997/05/14 20:52:45 pefo Exp $
+#	$OpenBSD: mtree.conf,v 1.2 1997/05/19 10:33:22 pefo Exp $
 
 /set type=dir uname=root gname=wheel mode=0755
 # .
@@ -58,21 +58,11 @@ bin
 # ./usr/bin
 ..
 
-# ./usr/lib
-lib
-# ./usr/lib
-..
-
 # ./usr/mdec
 mdec
 # ./usr/mdec
 ..
 
-# ./usr/libexec
-libexec
-# ./usr/libexec
-..
-
 # ./usr/sbin
 sbin
 # ./usr/sbin