diff options
| author |   deraadt <deraadt@openbsd.org> | 2006-06-03 19:33:35 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2006-06-03 19:33:35 +0000 |
| commit | ebf7b65c0e6e815ab86c75b21288f0c83688d49c (patch) | |
| tree | 378d3b8cace7e4942a81902c9a80ce303efb4cc2 | |
| parent | Use ifconfig delete/alias conforming with the man page. (diff) | |
| download | wireguard-openbsd-ebf7b65c0e6e815ab86c75b21288f0c83688d49c.tar.xz wireguard-openbsd-ebf7b65c0e6e815ab86c75b21288f0c83688d49c.zip | |
do chio.conf install from right place
| -rw-r--r-- | bin/chio/Makefile | 6 | ||||
| -rw-r--r-- | etc/Makefile | 5 | ||||
| -rw-r--r-- | etc/chio.conf (renamed from bin/chio/chio.conf) | 2 |
3 files changed, 5 insertions, 8 deletions
diff --git a/bin/chio/Makefile b/bin/chio/Makefile index c96cac02a2f..86bf7a8a612 100644 --- a/bin/chio/Makefile +++ b/bin/chio/Makefile @@ -1,12 +1,8 @@ -# $OpenBSD: Makefile,v 1.10 2006/06/02 19:19:10 beck Exp $ +# $OpenBSD: Makefile,v 1.11 2006/06/03 19:33:35 deraadt Exp $ PROG= chio SRCS= chio.c parse.y DPADD= ${LIBUTIL} LDADD= -lutil -distribution: - ${INSTALL} ${INSTALL_COPY} -g ${BINGRP} -m 444 \ - ${.CURDIR}/chio.conf ${DESTDIR}/etc/chio.conf - .include <bsd.prog.mk> 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/bin/chio/chio.conf b/etc/chio.conf index aa9ed4b9293..bcd8e110bb4 100644 --- a/bin/chio/chio.conf +++ b/etc/chio.conf @@ -1,4 +1,4 @@ -# $OpenBSD: chio.conf,v 1.1 2006/06/02 19:19:10 beck Exp $ +# $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 |