svn commit: r338740 - in head: etc sbin/dhclient

[Brad Davis]

Author: brd
Date: Tue Sep 18 00:11:45 2018
New Revision: 338740
URL: https://svnweb.freebsd.org/changeset/base/338740

Log:
  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

Added:
  head/sbin/dhclient/dhclient.conf
     - copied unchanged from r338739, head/etc/dhclient.conf
Deleted:
  head/etc/dhclient.conf
Modified:
  head/etc/Makefile
  head/sbin/dhclient/Makefile

Modified: head/etc/Makefile
==============================================================================
--- head/etc/Makefile	Tue Sep 18 00:10:29 2018	(r338739)
+++ head/etc/Makefile	Tue Sep 18 00:11:45 2018	(r338740)
@@ -13,7 +13,6 @@ SUBDIR+=sendmail
 .endif
 
 BIN1=	\
-	dhclient.conf \
 	disktab \
 	group \
 	hosts.allow \

Modified: head/sbin/dhclient/Makefile
==============================================================================
--- head/sbin/dhclient/Makefile	Tue Sep 18 00:10:29 2018	(r338739)
+++ head/sbin/dhclient/Makefile	Tue Sep 18 00:11:45 2018	(r338740)
@@ -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 \

Copied: head/sbin/dhclient/dhclient.conf (from r338739, head/etc/dhclient.conf)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sbin/dhclient/dhclient.conf	Tue Sep 18 00:11:45 2018	(r338740, copy of r338739, head/etc/dhclient.conf)
@@ -0,0 +1,8 @@
+# $FreeBSD$
+#
+#	This file is required by the ISC DHCP client.
+#	See ``man 5 dhclient.conf'' for details.
+#
+#	In most cases an empty file is sufficient for most people as the
+#	defaults are usually fine.
+#