summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2008-03-04 23:43:13 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2008-03-04 23:43:13 +0000
commit96a9e68b613b161948af09cf3e81a82b45bc3980 (patch)
tree39172012d1983ff81fabb8384504caf8a71f3731
parent70efc716c63d9d00939e569e5b22a93e2ba64300 (diff)
bsd.rd's physical memory usage collided with the bootblocks... The
bootblocks have been moved, but we want 4.2 to be upgradeable. So reduce the footprint of the bsd.rd by shrinking the ramdisk filesystem because it is way too large. tested by sthen and kettenis
-rw-r--r--distrib/hppa/ramdisk/Makefile4
-rw-r--r--etc/etc.hppa/disktab8
-rw-r--r--sys/arch/hppa/conf/RAMDISK4
3 files changed, 8 insertions, 8 deletions
diff --git a/distrib/hppa/ramdisk/Makefile b/distrib/hppa/ramdisk/Makefile
index 7383129d669..b6b81bb9652 100644
--- a/distrib/hppa/ramdisk/Makefile
+++ b/distrib/hppa/ramdisk/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2008/01/11 10:16:40 espie Exp $
+# $OpenBSD: Makefile,v 1.13 2008/03/04 23:43:11 deraadt Exp $
CBIN= instbin
ARCHDIR= ${.CURDIR}/..
@@ -18,7 +18,7 @@ DISKTYPE= rdroot
PID!= echo $$$$
REALIMAGE!= echo /tmp/image.${PID}
IMAGE?= ramdisk${REV}.fs
-IMAGESIZE?= 5120 # 2.5MB in 512 byte blocks
+IMAGESIZE?= 4608 # 2.25MB in 512 byte blocks
NEWFS_WILL_FAIL?=false
RDSETROOT?= elfrdsetroot
CRUNCHGENOPTS?=-E
diff --git a/etc/etc.hppa/disktab b/etc/etc.hppa/disktab
index d8215160ad2..847f7ace1ee 100644
--- a/etc/etc.hppa/disktab
+++ b/etc/etc.hppa/disktab
@@ -1,4 +1,4 @@
-# $OpenBSD: disktab,v 1.5 2003/05/06 09:20:15 mickey Exp $
+# $OpenBSD: disktab,v 1.6 2008/03/04 23:43:10 deraadt Exp $
#
# @(#)disktab 5.5 (Berkeley) 2/27/91
#
@@ -24,9 +24,9 @@
# with the same geometry.
rdroot|ramdiskroot|RAM-disk root FS image:\
- :ty=simulated:se#512:nc#20:nt#2:ns#128:\
- :ta=4.2BSD:oa#0:pa#5120:fa#1024:ba#8192:\
- :ob#0:pb#0:oc#0:pc#5120:
+ :ty=simulated:se#512:nc#18:nt#2:ns#128:\
+ :ta=4.2BSD:oa#0:pa#4608:fa#1024:ba#8192:\
+ :ob#0:pb#0:oc#0:pc#4608:
fakecdrom|Fake image for Bootable CDROM:\
:ty=removable:se#512:nt#1:rm#350:ns#640:nc#2048:\
diff --git a/sys/arch/hppa/conf/RAMDISK b/sys/arch/hppa/conf/RAMDISK
index b39f028e1bc..aa0147f3356 100644
--- a/sys/arch/hppa/conf/RAMDISK
+++ b/sys/arch/hppa/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.76 2008/01/09 23:58:43 sthen Exp $
+# $OpenBSD: RAMDISK,v 1.77 2008/03/04 23:43:12 deraadt Exp $
#
# Diskless kernel config
#
@@ -40,7 +40,7 @@ option TIMEZONE=0 # time zone to adjust RTC time by
option DST=0 # daylight saving time used by RTC
option RAMDISK_HOOKS
-option MINIROOTSIZE=5120
+option MINIROOTSIZE=4608
config bsd root on rd0a swap on rd0b # and sd0b
mainbus0 at root # root bus