Index: /luci/branches/luci-0.9/modules/admin-full/luasrc/model/cbi/admin_network/dhcpleases.lua
===================================================================
--- /luci/branches/luci-0.9/modules/admin-full/luasrc/model/cbi/admin_network/dhcpleases.lua	(revision 5118)
+++ /luci/branches/luci-0.9/modules/admin-full/luasrc/model/cbi/admin_network/dhcpleases.lua	(revision 5743)
@@ -3,4 +3,5 @@
 
 Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2010 Jo-Philipp Wich <xm@subsignal.org>
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,5 +19,5 @@
 local fs  = require "nixio.fs"
 
-m2 = Map("luci_ethers", translate("dhcp_leases"))
+m2 = Map("dhcp", translate("dhcp_leases"))
 
 local leasefn, leasefp, leases
@@ -47,11 +48,12 @@
 end
 
-s = m2:section(TypedSection, "static_lease", translate("luci_ethers"))
+s = m2:section(TypedSection, "host", translate("luci_ethers"))
 s.addremove = true
 s.anonymous = true
 s.template = "cbi/tblsection"
 
-mac = s:option(Value, "macaddr", translate("macaddress"))
-ip = s:option(Value, "ipaddr", translate("ipaddress"))
+name = s:option(Value, "name", translate("hostname"))
+mac = s:option(Value, "mac", translate("macaddress"))
+ip = s:option(Value, "ip", translate("ipaddress"))
 sys.net.arptable(function(entry)
 	ip:value(entry["IP address"])
Index: /ci/branches/luci-0.9/modules/admin-core/root/etc/config/luci_ethers
===================================================================
--- /luci/branches/luci-0.9/modules/admin-core/root/etc/config/luci_ethers	(revision 3927)
+++ 	(revision )
@@ -1,1 +1,0 @@
-
Index: /ci/branches/luci-0.9/modules/admin-core/root/etc/init.d/luci_ethers
===================================================================
--- /luci/branches/luci-0.9/modules/admin-core/root/etc/init.d/luci_ethers	(revision 4174)
+++ 	(revision )
@@ -1,37 +1,0 @@
-#!/bin/sh /etc/rc.common
-START=59
-
-apply_lease() {
-	local cfg="$1"
-
-	config_get macaddr "$cfg" macaddr
-	config_get ipaddr  "$cfg" ipaddr
-
-	[ -n "$macaddr" -a -n "$ipaddr" ] || return 0
-
-	echo "$macaddr $ipaddr" >> /var/etc/ethers
-}
-
-start() {
-	if [ ! -L /etc/ethers ]; then
-		test -f /etc/ethers && mv /etc/ethers /etc/ethers.local
-		ln -s /var/etc/ethers /etc/ethers
-	fi
-
-	test -d /var/etc || mkdir -p /var/etc
-
-	echo "# This file is autogenerated, use /etc/ethers.local instead" > /var/etc/ethers
-
-	config_load luci_ethers
-	config_foreach apply_lease static_lease
-
-	test -f /etc/ethers.local && cat /etc/ethers.local >> /var/etc/ethers
-
-	return 0
-}
-
-stop() {
-	test -f /var/etc/ethers && rm -f /var/etc/ethers
-
-	return 0
-}