summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2006-06-03 19:33:36 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2006-06-03 19:33:36 +0000
commitcacfa89e405b7ae6a43ad7e89e27f80d92f5d5fe (patch)
tree251a3878cef6f257f9ca797f9ada3ce6107ee7b8 /etc
parent234d3596a3dc18f5c939dba515ee64cd81a0394e (diff)
do chio.conf install from right place
Diffstat (limited to 'etc')
-rw-r--r--etc/Makefile5
-rw-r--r--etc/chio.conf11
2 files changed, 14 insertions, 2 deletions
diff --git a/etc/Makefile b/etc/Makefile
index 7eee8e266fc..52017fe933e 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.234 2006/06/01 16:43:23 norby Exp $
+# $OpenBSD: Makefile,v 1.235 2006/06/03 19:33:35 deraadt Exp $
TZDIR= /usr/share/zoneinfo
LOCALTIME= Canada/Mountain
@@ -80,6 +80,7 @@ distribution-etc-root-var: distrib-dirs
${INSTALL} -c -o root -g wheel -m 600 ospfd.conf ${DESTDIR}/etc
${INSTALL} -c -o root -g wheel -m 600 dvmrpd.conf ${DESTDIR}/etc
${INSTALL} -c -o root -g wheel -m 600 pf.conf ${DESTDIR}/etc
+ ${INSTALL} -c -o root -g wheel -m 600 chio.conf ${DESTDIR}/etc
${INSTALL} -c -o root -g wheel -m 600 hostapd.conf ${DESTDIR}/etc
${INSTALL} -c -o root -g wheel -m 600 ipsec.conf ${DESTDIR}/etc
${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 555 \
@@ -380,7 +381,7 @@ distrib:
DHSIZE=1024 1536 2048 3072 4096
update-moduli:
( \
- echo '# $$OpenBSD: Makefile,v 1.234 2006/06/01 16:43:23 norby Exp $$'; \
+ echo '# $$OpenBSD: Makefile,v 1.235 2006/06/03 19:33:35 deraadt Exp $$'; \
echo '# Time Type Tests Tries Size Generator Modulus'; \
( for i in ${DHSIZE}; do \
ssh-keygen -b $$i -G /dev/stdout; \
diff --git a/etc/chio.conf b/etc/chio.conf
new file mode 100644
index 00000000000..bcd8e110bb4
--- /dev/null
+++ b/etc/chio.conf
@@ -0,0 +1,11 @@
+# $OpenBSD: chio.conf,v 1.1 2006/06/03 19:33:35 deraadt Exp $
+# Configuration file for chio(8).
+# Each stanza configures a changer, to enumerate the st(4) devices
+# corresponding to each ch(4) drive. This file is only required
+# if you need a non-default behavior. See chio(8) for details.
+#
+# Example: tell chio that drive 0 corresponds to rst3 and drive 1 to rst2
+# changer ch0 {
+# drive rst3
+# drive rst2
+# }