summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2012-03-15 20:06:04 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2012-03-15 20:06:04 +0000
commit5630adf08d35665fdb2202af84a787090a2d27bc (patch)
tree43fee1f5c91401e58ee2a4a3121d6ec50fbd52af
parenta37e4bb2050d19bc4bc53ed83ddd565abd3f6a57 (diff)
Take cd9660 support off the "obviously a floppy" install media, to find
new space. The same cannot be done yet with some other architectures which share the RAMDISK kernel amongst media types too tightly. I am investigating the horrific src/distrib cleanups required to fix that.
-rw-r--r--sys/arch/amd64/conf/RAMDISK4
-rw-r--r--sys/arch/i386/conf/RAMDISK4
-rw-r--r--sys/arch/i386/conf/RAMDISKB4
-rw-r--r--sys/arch/i386/conf/RAMDISKC4
4 files changed, 8 insertions, 8 deletions
diff --git a/sys/arch/amd64/conf/RAMDISK b/sys/arch/amd64/conf/RAMDISK
index 994ed65a100..363eaa0ec34 100644
--- a/sys/arch/amd64/conf/RAMDISK
+++ b/sys/arch/amd64/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.54 2011/10/06 20:49:28 deraadt Exp $
+# $OpenBSD: RAMDISK,v 1.55 2012/03/15 20:06:02 deraadt Exp $
machine amd64 # architecture, used by config; REQUIRED
@@ -17,7 +17,7 @@ option FFS # UFS
#option NFSCLIENT # Network File System client
-option CD9660 # ISO 9660 + Rock Ridge file system
+#option CD9660 # ISO 9660 + Rock Ridge file system
#option MSDOSFS # MS-DOS file system
option INET # IP + ICMP + TCP + UDP
diff --git a/sys/arch/i386/conf/RAMDISK b/sys/arch/i386/conf/RAMDISK
index eb145976ac0..d5807888995 100644
--- a/sys/arch/i386/conf/RAMDISK
+++ b/sys/arch/i386/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.178 2011/09/21 16:59:27 deraadt Exp $
+# $OpenBSD: RAMDISK,v 1.179 2012/03/15 20:06:03 deraadt Exp $
machine i386 # architecture, used by config; REQUIRED
@@ -18,7 +18,7 @@ option FFS # UFS
#option NFSCLIENT # Network File System client
-option CD9660 # ISO 9660 + Rock Ridge file system
+#option CD9660 # ISO 9660 + Rock Ridge file system
option MSDOSFS # MS-DOS file system
option INET # IP + ICMP + TCP + UDP
diff --git a/sys/arch/i386/conf/RAMDISKB b/sys/arch/i386/conf/RAMDISKB
index 7529a72a0e7..7c8132c23f8 100644
--- a/sys/arch/i386/conf/RAMDISKB
+++ b/sys/arch/i386/conf/RAMDISKB
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISKB,v 1.120 2011/06/29 20:52:09 matthew Exp $
+# $OpenBSD: RAMDISKB,v 1.121 2012/03/15 20:06:03 deraadt Exp $
machine i386 # architecture, used by config; REQUIRED
@@ -18,7 +18,7 @@ option FFS # UFS
#option NFSCLIENT # Network File System client
-option CD9660 # ISO 9660 + Rock Ridge file system
+#option CD9660 # ISO 9660 + Rock Ridge file system
#option MSDOSFS # MS-DOS file system
option INET # IP + ICMP + TCP + UDP
diff --git a/sys/arch/i386/conf/RAMDISKC b/sys/arch/i386/conf/RAMDISKC
index d8b6889c1d0..14eaa0f9151 100644
--- a/sys/arch/i386/conf/RAMDISKC
+++ b/sys/arch/i386/conf/RAMDISKC
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISKC,v 1.101 2011/06/29 20:52:09 matthew Exp $
+# $OpenBSD: RAMDISKC,v 1.102 2012/03/15 20:06:03 deraadt Exp $
machine i386 # architecture, used by config; REQUIRED
@@ -18,7 +18,7 @@ option FFS # UFS
#option NFSCLIENT # Network File System client
-option CD9660 # ISO 9660 + Rock Ridge file system
+#option CD9660 # ISO 9660 + Rock Ridge file system
option MSDOSFS # MS-DOS file system
option INET # IP + ICMP + TCP + UDP