diff options
| author |   ajacoutot <ajacoutot@openbsd.org> | 2014-08-29 18:05:39 +0000 |
|---|---|---|
| committer | ajacoutot <ajacoutot@openbsd.org> | 2014-08-29 18:05:39 +0000 |
| commit | 5e2bc0896779fb4a808144449ff2d67b8f3da7e3 (patch) | |
| tree | 53f0deeb5ae1efc0386eb93f2490870d992f45e9 | |
| parent | Document the fact that 'enable' can also be used to modify flags even if (diff) | |
| download | wireguard-openbsd-5e2bc0896779fb4a808144449ff2d67b8f3da7e3.tar.xz wireguard-openbsd-5e2bc0896779fb4a808144449ff2d67b8f3da7e3.zip | |
Move dhclient.conf(5) to examples.
no objections from todd@ millert@ rpe@
| -rw-r--r-- | distrib/sets/lists/base/mi | 1 | ||||
| -rw-r--r-- | distrib/sets/lists/etc/mi | 1 | ||||
| -rw-r--r-- | etc/Makefile | 10 | ||||
| -rw-r--r-- | etc/examples/dhclient.conf (renamed from etc/dhclient.conf) | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/distrib/sets/lists/base/mi b/distrib/sets/lists/base/mi index ee432cf3968..0f72f44148a 100644 --- a/distrib/sets/lists/base/mi +++ b/distrib/sets/lists/base/mi @@ -52,6 +52,7 @@ ./etc/examples ./etc/examples/bgpd.conf ./etc/examples/chio.conf +./etc/examples/dhclient.conf ./etc/examples/dhcpd.conf ./etc/examples/dvmrpd.conf ./etc/examples/exports diff --git a/distrib/sets/lists/etc/mi b/distrib/sets/lists/etc/mi index 57707d25043..83fe99501da 100644 --- a/distrib/sets/lists/etc/mi +++ b/distrib/sets/lists/etc/mi @@ -5,7 +5,6 @@ ./etc/csh.cshrc ./etc/csh.login ./etc/csh.logout -./etc/dhclient.conf ./etc/dumpdates ./etc/fbtab ./etc/ftpusers diff --git a/etc/Makefile b/etc/Makefile index 6e72a18f376..111074a100b 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.391 2014/08/26 20:19:26 rpe Exp $ +# $OpenBSD: Makefile,v 1.392 2014/08/29 18:05:39 ajacoutot Exp $ TZDIR= /usr/share/zoneinfo LOCALTIME= Canada/Mountain @@ -30,16 +30,16 @@ kernels: bootblocks ${ALL_KERNELS} # -rw-r--r-- BINOWN= root BINGRP= wheel -MUTABLE=changelist csh.cshrc csh.login csh.logout daily dhclient.conf \ +MUTABLE=changelist csh.cshrc csh.login csh.logout daily \ etc.${MACHINE}/disktab etc.${MACHINE}/login.conf ftpusers \ gettytab group hosts ksh.kshrc locate.rc mailer.conf man.conf \ moduli monthly myname netstart networks newsyslog.conf \ pf.os protocols rc rc.conf rpc services shells syslog.conf weekly # -rw-r--r-- -EXAMPLES=chio.conf dhcpd.conf exports ftpchroot hosts.lpd httpd.conf \ - ifstated.conf inetd.conf mixerctl.conf mrouted.conf ntpd.conf \ - printcap rbootd.conf remote sensorsd.conf +EXAMPLES=chio.conf dhclient.conf dhcpd.conf exports ftpchroot hosts.lpd \ + httpd.conf ifstated.conf inetd.conf mixerctl.conf mrouted.conf \ + ntpd.conf printcap rbootd.conf remote sensorsd.conf .if ${MACHINE} != "aviion" EXAMPLES+= wsconsctl.conf .endif diff --git a/etc/dhclient.conf b/etc/examples/dhclient.conf index b6c156b41de..7b7cff1d4f6 100644 --- a/etc/dhclient.conf +++ b/etc/examples/dhclient.conf @@ -1,4 +1,4 @@ -# $OpenBSD: dhclient.conf,v 1.2 2011/04/04 11:14:52 krw Exp $ +# $OpenBSD: dhclient.conf,v 1.1 2014/08/29 18:05:39 ajacoutot Exp $ # # DHCP Client Configuration # |