summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2017-06-13 16:28:07 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2017-06-13 16:28:07 +0000
commitd93b01eff47beefcf7c784bebb23aed1528c37c3 (patch)
treee55f29471038e6c026589722ed03b1109c606324
parentde0551dc511f40b8b5d7263c8e7fc5cd64aa9e8f (diff)
The KARL compile.tgz linkkit adds some growth to the base set.
Prepare the install*.fs files for this growth.
-rw-r--r--distrib/amd64/iso/Makefile6
-rw-r--r--distrib/i386/iso/Makefile6
-rw-r--r--etc/etc.amd64/disktab7
-rw-r--r--etc/etc.i386/disktab7
4 files changed, 18 insertions, 8 deletions
diff --git a/distrib/amd64/iso/Makefile b/distrib/amd64/iso/Makefile
index d902fd4f574..ad8b1f4a606 100644
--- a/distrib/amd64/iso/Makefile
+++ b/distrib/amd64/iso/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.17 2015/09/07 01:41:35 deraadt Exp $
+# $OpenBSD: Makefile,v 1.18 2017/06/13 16:28:04 deraadt Exp $
TOP= ${.CURDIR}/..
@@ -7,8 +7,8 @@ TOP= ${.CURDIR}/..
CDROM= install${REV}.iso
FS= install${REV}.fs
-FSSIZE= 573440
-FSTYPE= install280
+FSSIZE= 737280
+FSTYPE= install360
RAMDISK= RAMDISK_CD
diff --git a/distrib/i386/iso/Makefile b/distrib/i386/iso/Makefile
index 073480d6f08..dd502999869 100644
--- a/distrib/i386/iso/Makefile
+++ b/distrib/i386/iso/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2014/09/21 13:44:44 deraadt Exp $
+# $OpenBSD: Makefile,v 1.13 2017/06/13 16:28:06 deraadt Exp $
TOP= ${.CURDIR}/..
@@ -7,8 +7,8 @@ TOP= ${.CURDIR}/..
CDROM= install${REV}.iso
FS= install${REV}.fs
-FSSIZE= 491520
-FSTYPE= install240
+FSSIZE= 737280
+FSTYPE= install360
RAMDISK= RAMDISK_CD
diff --git a/etc/etc.amd64/disktab b/etc/etc.amd64/disktab
index de540ae25e3..ec04c82462a 100644
--- a/etc/etc.amd64/disktab
+++ b/etc/etc.amd64/disktab
@@ -1,10 +1,15 @@
-# $OpenBSD: disktab,v 1.18 2016/12/30 22:26:27 deraadt Exp $
+# $OpenBSD: disktab,v 1.19 2017/06/13 16:28:06 deraadt Exp $
mini34|gzip bsd.rd disk image 4.34375MB:\
:dt=rdroot:se#512:nt#1:ns#64:nc#140:\
:pa#8896:oa#64:ba#8192:fa#1024:ta=4.2BSD: \
:pc#8960:oc#0:
+install360|install.fs disk image 360MB:\
+ :dt=rdroot:se#512:nt#1:ns#64:nc#11520:\
+ :pa#737216:oa#64:ba#8192:fa#1024:ta=4.2BSD: \
+ :pc#737280:oc#0:
+
install280|install.fs disk image 280MB:\
:dt=rdroot:se#512:nt#1:ns#64:nc#8960:\
:pa#573376:oa#64:ba#8192:fa#1024:ta=4.2BSD: \
diff --git a/etc/etc.i386/disktab b/etc/etc.i386/disktab
index b09419f9a01..fab510caf4e 100644
--- a/etc/etc.i386/disktab
+++ b/etc/etc.i386/disktab
@@ -1,10 +1,15 @@
-# $OpenBSD: disktab,v 1.26 2016/12/30 22:26:29 deraadt Exp $
+# $OpenBSD: disktab,v 1.27 2017/06/13 16:28:06 deraadt Exp $
mini34|gzip bsd.rd disk image 4.34375MB:\
:dt=rdroot:se#512:nt#1:ns#64:nc#124:\
:pa#7872:oa#64:ba#8192:fa#1024:ta=4.2BSD: \
:pc#7936:oc#0:
+install360|install.fs disk image 360MB:\
+ :dt=rdroot:se#512:nt#1:ns#64:nc#11520:\
+ :pa#737216:oa#64:ba#8192:fa#1024:ta=4.2BSD: \
+ :pc#737280:oc#0:
+
install240|install.fs disk image 240MB:\
:dt=rdroot:se#512:nt#1:ns#64:nc#7680:\
:pa#491456:oa#64:ba#8192:fa#1024:ta=4.2BSD: \