summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--distrib/ramdisk/Makefile7
-rw-r--r--distrib/ramdisk/list5
-rw-r--r--distrib/sparc/ramdisk/Makefile.inc6
-rw-r--r--etc/etc.sparc/disktab9
-rw-r--r--sys/arch/sparc/conf/RAMDISK2
5 files changed, 17 insertions, 12 deletions
diff --git a/distrib/ramdisk/Makefile b/distrib/ramdisk/Makefile
index aaa74bc7923..64effe2aa1e 100644
--- a/distrib/ramdisk/Makefile
+++ b/distrib/ramdisk/Makefile
@@ -1,5 +1,5 @@
-# $OpenBSD: Makefile,v 1.1 1997/05/14 20:44:34 deraadt Exp $
-# $OpenBSD: Makefile,v 1.1 1997/05/14 20:44:34 deraadt Exp $
+# $OpenBSD: Makefile,v 1.2 1997/05/14 21:52:59 deraadt Exp $
+# $OpenBSD: Makefile,v 1.2 1997/05/14 21:52:59 deraadt Exp $
# $NetBSD: Makefile,v 1.2.4.3 1996/07/04 07:05:32 leo Exp $
# Revision is 2.1
@@ -48,7 +48,7 @@ bsd:
bsd.rd: bsd ${IMAGE} ${.OBJDIR}/rdsetroot
cp bsd bsd.rd
${.OBJDIR}/rdsetroot bsd.rd < ${IMAGE}
- ${STRIP} bsd.rd
+# ${STRIP} bsd.rd
${.OBJDIR}/rdsetroot: ${.CURDIR}/../common/rdsetroot.c
${HOSTCC} ${HOSTCCFLAGS} -o rdsetroot ${.CURDIR}/../common/rdsetroot.c
@@ -68,7 +68,6 @@ ${IMAGE}: ${CBIN}
@echo ""
umount ${MOUNT_POINT}
vnconfig -u ${VND_DEV}
- cat /*bin/* > /dev/null
cp ${REALIMAGE} ${IMAGE}
rm ${REALIMAGE}
diff --git a/distrib/ramdisk/list b/distrib/ramdisk/list
index a798f5dafa6..c15f6a1eb5e 100644
--- a/distrib/ramdisk/list
+++ b/distrib/ramdisk/list
@@ -1,4 +1,4 @@
-# $OpenBSD: list,v 1.1 1997/05/14 20:44:35 deraadt Exp $
+# $OpenBSD: list,v 1.2 1997/05/14 21:52:59 deraadt Exp $
# $NetBSD: list,v 1.4.4.1 1996/06/20 20:30:26 pk Exp $
SRCDIRS usr.bin bin sbin usr.sbin gnu/usr.bin
@@ -47,6 +47,7 @@ SYMLINK ../../instbin usr/sbin/chroot
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/vim usr/bin/vi
# `internal' crunchgen links
ARGVLINK mount_ffs ffs
@@ -59,7 +60,7 @@ COPY ${DESTDIR}/etc/group etc/group
COPY ${DESTDIR}/etc/protocols etc/protocols
COPY ${DESTDIR}/etc/services etc/services
COPY ${DESTDIR}/etc/spwd.db etc/spwd.db
-### COPY ${DESTDIR}/etc/virc etc/virc
+COPY ${DESTDIR}/etc/virc etc/virc
# and the installation scripts
COPY ${CURDIR}/../miniroot/install.sub install.sub
diff --git a/distrib/sparc/ramdisk/Makefile.inc b/distrib/sparc/ramdisk/Makefile.inc
index c1532d066c1..05efd13b4b2 100644
--- a/distrib/sparc/ramdisk/Makefile.inc
+++ b/distrib/sparc/ramdisk/Makefile.inc
@@ -1,7 +1,7 @@
-# $OpenBSD: Makefile.inc,v 1.1 1997/05/14 20:44:37 deraadt Exp $
-# $OpenBSD: Makefile.inc,v 1.1 1997/05/14 20:44:37 deraadt Exp $
+# $OpenBSD: Makefile.inc,v 1.2 1997/05/14 21:53:00 deraadt Exp $
+# $OpenBSD: Makefile.inc,v 1.2 1997/05/14 21:53:00 deraadt Exp $
-IMAGESIZE= 6144
+IMAGESIZE= 4096
BOOT_INSTALLBOOT?= /usr/mdec/bootxx
GZIP?= gzip
GZIPFLAGS?= -9v
diff --git a/etc/etc.sparc/disktab b/etc/etc.sparc/disktab
index 3fa87d2b2a4..590e7a2091e 100644
--- a/etc/etc.sparc/disktab
+++ b/etc/etc.sparc/disktab
@@ -1,4 +1,4 @@
-# $Id: disktab,v 1.9 1997/05/13 08:54:18 deraadt Exp $
+# $Id: disktab,v 1.10 1997/05/14 21:52:58 deraadt Exp $
#
# @(#)disktab 5.5 (Berkeley) 2/27/91
#
@@ -20,10 +20,15 @@
miniroot:\
:ty=winchester:se#512:nt#2:rm#300:ns#64:nc#80:\
:ts=3500:\
- :pa#10240:oa#0:ba#4096:fa#512:ta=4.2BSD:\
+ :pa#10240:oa#0:ba#8192:fa#512:ta=4.2BSD:\
:pb#0:ob#0:\
:pc#10240:oc#0:
+rdroot:\
+ :ty=ramdisk:se#512:nt#2:rm#300:ns#8:nc#1024:\
+ :pa#4096:oa#0:ta=4.2BSD:ba#8192:fa#1024: \
+ :pc#4096:oc#0:
+
floppy|floppy3|3in|3.5in High Density Floppy:\
:ty=floppy:se#512:nt#2:rm#300:ns#18:nc#80:\
:pa#2880:oa#0:ba#4096:fa#512:ta=4.2BSD:ba#4096:fa#512: \
diff --git a/sys/arch/sparc/conf/RAMDISK b/sys/arch/sparc/conf/RAMDISK
index 0b788c72d7c..1df6147a311 100644
--- a/sys/arch/sparc/conf/RAMDISK
+++ b/sys/arch/sparc/conf/RAMDISK
@@ -5,7 +5,7 @@ machine sparc
maxusers 32
option RAMDISK_HOOKS
-option MINIROOTSIZE=2048
+option MINIROOTSIZE=4096
option TIMEZONE=0 # time zone to adjust RTC time by
option DST=0 # daylight savings time used by RTC