summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorSteven Barth <steven@midlink.org>2009-10-28 16:40:05 +0000
committerSteven Barth <steven@midlink.org>2009-10-28 16:40:05 +0000
commit5d9fcbd1c1566b02d1fbce30fec080b5778f092d (patch)
treee379490a54c51c9c789d4f565a8de4395d935246
parent910f48117f6934fe95253643ce6b39fdcd6b8bec (diff)
Add etherhosts as combination of luci_ethers and luci_hosts
-rw-r--r--modules/admin-core/root/etc/config/luci_etherhosts0
-rwxr-xr-xmodules/admin-core/root/etc/init.d/luci_ethers2
-rwxr-xr-xmodules/admin-core/root/etc/init.d/luci_hosts2
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
}