From: Felix Fietkau <nbd@openwrt.org>
Date: Sat, 19 Sep 2009 23:04:34 +0000 (+0000)
Subject: base-files: fix conffiles entry check (patch from #2425)
X-Git-Tag: reboot~22426
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=ca300a2f07ab1af6c838493898cb1ac839244bae;p=openwrt%2Fstaging%2Flynxis.git

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

SVN-Revision: 17618
---

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 6995601a28..15920d52b6 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