Add etherhosts as combination of luci_ethers and luci_hosts

3 files changed, 4 insertions, 0 deletions

diff --git a/modules/admin-core/root/etc/config/luci_etherhosts b/modules/admin-core/root/etc/config/luci_etherhosts
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/modules/admin-core/root/etc/config/luci_etherhosts
diff --git a/modules/admin-core/root/etc/init.d/luci_ethers b/modules/admin-core/root/etc/init.d/luci_ethers
index fb1deb2d4..188c01cc2 100755
--- a/modules/admin-core/root/etc/init.d/luci_ethers
+++ b/modules/admin-core/root/etc/init.d/luci_ethers
@@ -23,7 +23,9 @@ start() {
 	echo "# This file is autogenerated, use /etc/ethers.local instead" > /var/etc/ethers
 
 	config_load luci_ethers
+	config_load luci_etherhosts
 	config_foreach apply_lease static_lease
+	config_foreach apply_lease entry
 
 	test -f /etc/ethers.local && cat /etc/ethers.local >> /var/etc/ethers
 
diff --git a/modules/admin-core/root/etc/init.d/luci_hosts b/modules/admin-core/root/etc/init.d/luci_hosts
index ae94714ef..8b8305da7 100755
--- a/modules/admin-core/root/etc/init.d/luci_hosts
+++ b/modules/admin-core/root/etc/init.d/luci_hosts
@@ -24,7 +24,9 @@ start() {
 	test -f /etc/hosts.local && cat /etc/hosts.local >> /var/etc/hosts
 
 	config_load luci_hosts
+	config_load luci_etherhosts
 	config_foreach apply_host host
+	config_foreach apply_host entry
 
 	return 0
 }