Add etherhosts as combination of luci_ethers and luci_hosts

diff --git a/modules/admin-core/root/etc/config/luci_etherhosts b/modules/admin-core/root/etc/config/luci_etherhosts
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/modules/admin-core/root/etc/init.d/luci_ethers b/modules/admin-core/root/etc/init.d/luci_ethers
index fb1deb2d41eb7fe027ab975370f5829bace043b7..188c01cc2dd848b5c23666426bddf5f2f877bf9f 100755 (executable)
--- 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 ae94714effee63858de9394ed4162ab048ff06a1..8b8305da76537a989e06f3bb3e6df741cd3a540b 100755 (executable)
--- 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
 }