Merge remote-tracking branch 'origin/master' into next

[ipfire-2.x.git] / config / rootfiles / common / dhcp

diff --git a/config/rootfiles/common/dhcp b/config/rootfiles/common/dhcp
index c2f5aed0557230addc606acb68dc87f82859ee69..ff225a5714b1cd34b032de240a7910d3fdf3427d 100644 (file)
--- a/config/rootfiles/common/dhcp
+++ b/config/rootfiles/common/dhcp
@@ -1,5 +1,7 @@
-#etc/dhclient.conf
-etc/dhcpd.conf
+#etc/dhcp
+#etc/dhcp/dhclient.conf.example
+etc/dhcp/dhcpd.conf
+#etc/dhcp/dhcpd.conf.example
 #usr/bin/omshell
 #usr/include/dhcpctl
 #usr/include/dhcpctl/dhcpctl.h
@@ -20,7 +22,7 @@ etc/dhcpd.conf
 #usr/lib/libomapi.a
 #usr/sbin/dhclient
 usr/sbin/dhcpd
-#usr/sbin/dhcrelay
+usr/sbin/dhcrelay
 #usr/share/man/man1/omshell.1
 #usr/share/man/man3/dhcpctl.3
 #usr/share/man/man3/omapi.3