From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sat, 19 Sep 2009 23:04:34 +0000 (+0000)
Subject: base-files: fix conffiles entry check (patch from #2425)
X-Git-Url: https://git.rohieb.name/openwrt.git/commitdiff_plain/ac7068d7d70aedd3867546cda3f2be9add6e5599

base-files: fix conffiles entry check (patch from #2425)

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@17618 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 6995601a2..15920d52b 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -194,7 +194,7 @@ define Package/base-files/install
 	$(call Package/base-files/install-target,$(1))
 	for conffile in $(1)/etc/config/*; do \
 		if [ -f "$$$$conffile" ]; then \
-			grep "$$$$conffile" $(1)/CONTROL/conffiles || \
+			grep "$$$${conffile##$(1)}" $(1)/CONTROL/conffiles || \
 				echo "$$$${conffile##$(1)}" >> $(1)/CONTROL/conffiles; \
 		fi \
 	done