summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTodd T. Fries <todd@cvs.openbsd.org>2008-06-26 16:31:02 +0000
committerTodd T. Fries <todd@cvs.openbsd.org>2008-06-26 16:31:02 +0000
commit4c2a60f6218c77b0e891c84e394cdf5865da47e3 (patch)
tree3103fd0300f94fbaf4a5a1a071ee7206aebdbde7
parent994450808dcdc1dddfeb7901c833e69e47ed2fdd (diff)
add bio & bioctl to a couple cd based ramdisks
ok deraadt@
-rw-r--r--distrib/amd64/ramdisk_cd/list.local3
-rw-r--r--distrib/i386/ramdisk_cd/list.local3
-rw-r--r--sys/arch/amd64/conf/RAMDISK_CD3
-rw-r--r--sys/arch/i386/conf/RAMDISK_CD3
4 files changed, 8 insertions, 4 deletions
diff --git a/distrib/amd64/ramdisk_cd/list.local b/distrib/amd64/ramdisk_cd/list.local
index 9b06e2493ab..87a63325705 100644
--- a/distrib/amd64/ramdisk_cd/list.local
+++ b/distrib/amd64/ramdisk_cd/list.local
@@ -1,4 +1,4 @@
-# $OpenBSD: list.local,v 1.9 2007/02/04 23:30:19 jsg Exp $
+# $OpenBSD: list.local,v 1.10 2008/06/26 16:31:01 todd Exp $
# add local links; use bin/sh since instbin has already been unlinked
#LINK instbin sbin/ccdconfig
@@ -7,6 +7,7 @@ LINK instbin sbin/rtsol
LINK instbin sbin/mount_udf
LINK instbin sbin/dhclient
+LINK instbin sbin/bioctl
COPY ${DESTDIR}/etc/firmware/kue etc/firmware/kue
COPY ${DESTDIR}/etc/firmware/bnx etc/firmware/bnx
diff --git a/distrib/i386/ramdisk_cd/list.local b/distrib/i386/ramdisk_cd/list.local
index f6556bf2341..412ddf2629e 100644
--- a/distrib/i386/ramdisk_cd/list.local
+++ b/distrib/i386/ramdisk_cd/list.local
@@ -1,4 +1,4 @@
-# $OpenBSD: list.local,v 1.17 2007/02/04 23:30:19 jsg Exp $
+# $OpenBSD: list.local,v 1.18 2008/06/26 16:31:01 todd Exp $
# add local links; use bin/sh since instbin has already been unlinked
LINK instbin sbin/ccdconfig
@@ -7,6 +7,7 @@ LINK instbin sbin/rtsol
LINK instbin sbin/apm sbin/zzz
LINK instbin sbin/apmd
LINK instbin sbin/mount_udf
+LINK instbin sbin/bioctl
# firmwares that might need loading
#COPY ${DESTDIR}/etc/firmware/tigon1 etc/firmware/tigon1
diff --git a/sys/arch/amd64/conf/RAMDISK_CD b/sys/arch/amd64/conf/RAMDISK_CD
index 6f700cf5af2..e46b1790d97 100644
--- a/sys/arch/amd64/conf/RAMDISK_CD
+++ b/sys/arch/amd64/conf/RAMDISK_CD
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK_CD,v 1.85 2008/06/08 20:37:39 deraadt Exp $
+# $OpenBSD: RAMDISK_CD,v 1.86 2008/06/26 16:31:01 todd Exp $
machine amd64 # architecture, used by config; REQUIRED
@@ -336,3 +336,4 @@ pseudo-device bpfilter 1 # packet filter
pseudo-device rd 1 # ramdisk
pseudo-device ccd 4 # concatenated disk devices
pseudo-device wsmux 2
+pseudo-device bio 1 # ioctl multiplexing device
diff --git a/sys/arch/i386/conf/RAMDISK_CD b/sys/arch/i386/conf/RAMDISK_CD
index 3803cecc17b..3c2fd80a01c 100644
--- a/sys/arch/i386/conf/RAMDISK_CD
+++ b/sys/arch/i386/conf/RAMDISK_CD
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK_CD,v 1.154 2008/06/08 20:37:39 deraadt Exp $
+# $OpenBSD: RAMDISK_CD,v 1.155 2008/06/26 16:31:01 todd Exp $
machine i386 # architecture, used by config; REQUIRED
@@ -421,3 +421,4 @@ pseudo-device bpfilter 1 # packet filter
pseudo-device rd 1 # ramdisk
pseudo-device ccd 4 # concatenated disk devices
pseudo-device wsmux 2
+pseudo-device bio 1 # ioctl multiplexing device