summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorotto <otto@openbsd.org>2020-03-02 16:52:53 +0000
committerotto <otto@openbsd.org>2020-03-02 16:52:53 +0000
commite8a12932b0224911f3e6a5d2e157543d974e6473 (patch)
tree5e3a7f048d9181feaad4f09f4af6e1fa76c7f8a4
parentShuffle logic a bit to make sizes/limits more obvious. (diff)
downloadwireguard-openbsd-e8a12932b0224911f3e6a5d2e157543d974e6473.tar.xz
wireguard-openbsd-e8a12932b0224911f3e6a5d2e157543d974e6473.zip
amd64 ramdisk does not support CD9660, so no use to have a cd(4).
Makes room for upcoming FFS2 support for the installer. ok deraadt@
-rw-r--r--distrib/amd64/ramdiskA/list3
-rw-r--r--sys/arch/amd64/conf/RAMDISK4
2 files changed, 3 insertions, 4 deletions
diff --git a/distrib/amd64/ramdiskA/list b/distrib/amd64/ramdiskA/list
index b8dac707cfc..a0e52b12efe 100644
--- a/distrib/amd64/ramdiskA/list
+++ b/distrib/amd64/ramdiskA/list
@@ -1,4 +1,4 @@
-# $OpenBSD: list,v 1.1 2019/06/07 14:39:56 deraadt Exp $
+# $OpenBSD: list,v 1.2 2020/03/02 16:52:53 otto Exp $
SRCDIRS distrib/special
@@ -35,7 +35,6 @@ LINK instbin sbin/init
LINK instbin sbin/kbd
LINK instbin sbin/mknod
LINK instbin sbin/mount
-LINK instbin sbin/mount_cd9660
LINK instbin sbin/mount_ffs
LINK instbin sbin/newfs
LINK instbin sbin/ping sbin/ping6
diff --git a/sys/arch/amd64/conf/RAMDISK b/sys/arch/amd64/conf/RAMDISK
index 1bcc775e4a0..b279c9c69ef 100644
--- a/sys/arch/amd64/conf/RAMDISK
+++ b/sys/arch/amd64/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.75 2020/01/20 23:27:01 deraadt Exp $
+# $OpenBSD: RAMDISK,v 1.76 2020/03/02 16:52:53 otto Exp $
machine amd64
maxusers 4
@@ -79,7 +79,7 @@ mfi* at pci? # LSI MegaRAID SAS controllers
scsibus* at scsi?
sd* at scsibus? # SCSI disk drives
-cd* at scsibus? # SCSI CD-ROM drives
+#cd* at scsibus? # SCSI CD-ROM drives
pciide* at pci? flags 0x0000
wd* at pciide? flags 0x0000