From 27109e5245f5f553bd3ea4e59914482202e75aa7 Mon Sep 17 00:00:00 2001
From: Jo-Philipp Wich <jow@openwrt.org>
Date: Wed, 28 Jan 2009 18:18:48 +0000
Subject: [PATCH] Merge r4174

---
 modules/admin-core/root/etc/init.d/luci_ethers | 12 +++++++-----
 modules/admin-core/root/etc/init.d/luci_hosts  |  2 ++
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/modules/admin-core/root/etc/init.d/luci_ethers b/modules/admin-core/root/etc/init.d/luci_ethers
index 8cf46729df..fb1deb2d41 100755
--- a/modules/admin-core/root/etc/init.d/luci_ethers
+++ b/modules/admin-core/root/etc/init.d/luci_ethers
@@ -8,7 +8,7 @@ apply_lease() {
 	config_get ipaddr  "$cfg" ipaddr
 
 	[ -n "$macaddr" -a -n "$ipaddr" ] || return 0
-	
+
 	echo "$macaddr $ipaddr" >> /var/etc/ethers
 }
 
@@ -19,17 +19,19 @@ start() {
 	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
 }
diff --git a/modules/admin-core/root/etc/init.d/luci_hosts b/modules/admin-core/root/etc/init.d/luci_hosts
index 3c1034a6e3..ae94714eff 100755
--- a/modules/admin-core/root/etc/init.d/luci_hosts
+++ b/modules/admin-core/root/etc/init.d/luci_hosts
@@ -18,6 +18,8 @@ start() {
 		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
 
-- 
2.30.2