luci-0.9: merge r5744

diff --git a/modules/admin-core/root/etc/config/luci_hosts b/modules/admin-core/root/etc/config/luci_hosts
deleted file mode 100644 (file)
index 8b13789..0000000
--- a/modules/admin-core/root/etc/config/luci_hosts
+++ /dev/null
@@ -1 +0,0 @@
-

diff --git a/modules/admin-core/root/etc/init.d/luci_hosts b/modules/admin-core/root/etc/init.d/luci_hosts
deleted file mode 100755 (executable)
index ae94714..0000000
--- a/modules/admin-core/root/etc/init.d/luci_hosts
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/sh /etc/rc.common
-START=59
-
-apply_host() {
-       local cfg="$1"
-
-       config_get hostname "$cfg" hostname
-       config_get ipaddr   "$cfg" ipaddr
-
-       [ -n "$hostname" -a -n "$ipaddr" ] || return 0
-
-       echo "$ipaddr $hostname" >> /var/etc/hosts
-}
-
-start() {
-       if [ ! -L /etc/hosts ]; then
-               test -f /etc/hosts && mv /etc/hosts /etc/hosts.local
-               ln -s /var/etc/hosts /etc/hosts
-       fi
-
-       echo "# This file is autogenerated, use /etc/hosts.local instead" > /var/etc/hosts
-
-       test -d /var/etc || mkdir -p /var/etc
-       test -f /etc/hosts.local && cat /etc/hosts.local >> /var/etc/hosts
-
-       config_load luci_hosts
-       config_foreach apply_host host
-
-       return 0
-}
-
-stop() {
-       test -f /var/etc/hosts && rm -f /var/etc/hosts
-
-       return 0
-}

diff --git a/modules/admin-full/luasrc/model/cbi/admin_network/hosts.lua b/modules/admin-full/luasrc/model/cbi/admin_network/hosts.lua
index dbf4aff90b81e0ff71918e3627d34f8709605501..3570a1bc73853679129ab60e9963459dac9e8481 100644 (file)
--- a/modules/admin-full/luasrc/model/cbi/admin_network/hosts.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_network/hosts.lua
@@ -14,15 +14,15 @@ $Id$
 
 require("luci.sys")
 require("luci.util")
-m = Map("luci_hosts", translate("hostnames"))
+m = Map("dhcp", translate("hostnames"))
 
-s = m:section(TypedSection, "host", translate("hostnames_entries"))
+s = m:section(TypedSection, "domain", translate("hostnames_entries"))
 s.addremove = true
 s.anonymous = true
 s.template = "cbi/tblsection"
 
-hn = s:option(Value, "hostname", translate("hostnames_hostname"))
-ip = s:option(Value, "ipaddr", translate("hostnames_address"))
+hn = s:option(Value, "name", translate("hostnames_hostname"))
+ip = s:option(Value, "ip", translate("hostnames_address"))
 for i, dataset in ipairs(luci.sys.net.arptable()) do
        ip:value(
                dataset["IP address"],