aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad Davis <brd@FreeBSD.org>2018-09-18 00:11:45 +0000
committerBrad Davis <brd@FreeBSD.org>2018-09-18 00:11:45 +0000
commit62e23a47811d5ae29d0a01865952a8e23fcc977d (patch)
treed5660bebfb86effa666288c621e48ffa285fcf4c
parent9f1e4c08ce8615bcd0a1a484bf1900709b407d82 (diff)
downloadsrc-62e23a47811d5ae29d0a01865952a8e23fcc977d.tar.gz
src-62e23a47811d5ae29d0a01865952a8e23fcc977d.zip
Move dhclient.conf to sbin/dhclient/.
This also leverages CONFS for handling config files. Approved by: re (gjb), will (mentor) Differential Revision: https://reviews.freebsd.org/D17160
Notes
Notes: svn path=/head/; revision=338740
-rw-r--r--etc/Makefile1
-rw-r--r--sbin/dhclient/Makefile1
-rw-r--r--sbin/dhclient/dhclient.conf (renamed from etc/dhclient.conf)0
3 files changed, 1 insertions, 1 deletions
diff --git a/etc/Makefile b/etc/Makefile
index 164e769fea11..afb1e9890bc5 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -13,7 +13,6 @@ SUBDIR+=sendmail
.endif
BIN1= \
- dhclient.conf \
disktab \
group \
hosts.allow \
diff --git a/sbin/dhclient/Makefile b/sbin/dhclient/Makefile
index 99b749eb720f..cdf93b8b8145 100644
--- a/sbin/dhclient/Makefile
+++ b/sbin/dhclient/Makefile
@@ -33,6 +33,7 @@
.include <src.opts.mk>
+CONFS= dhclient.conf
PACKAGE=runtime
SRCS= dhclient.c clparse.c alloc.c dispatch.c hash.c bpf.c options.c \
tree.c conflex.c errwarn.c inet.c packet.c convert.c tables.c \
diff --git a/etc/dhclient.conf b/sbin/dhclient/dhclient.conf
index a7639d904aad..a7639d904aad 100644
--- a/etc/dhclient.conf
+++ b/sbin/dhclient/dhclient.conf