aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2009-11-20 23:02:35 +0000
committerJo-Philipp Wich <jow@openwrt.org>2009-11-20 23:02:35 +0000
commit4d9b1d6c756b76e037285a7519c4ec20014aa654 (patch)
tree543df33af0f3de47b961f4f401c9dbe67343947b
parent60a4353fdd5bb91d209a6fe970c70361b15a0ea5 (diff)
downloadupstream-4d9b1d6c756b76e037285a7519c4ec20014aa654.tar.gz
upstream-4d9b1d6c756b76e037285a7519c4ec20014aa654.tar.bz2
upstream-4d9b1d6c756b76e037285a7519c4ec20014aa654.zip
base-files: sysupgrade: restrict find command to plain files to avoid duplicates when generating the conffiles tgz archive
SVN-Revision: 18455
-rw-r--r--package/base-files/Makefile2
-rwxr-xr-xpackage/base-files/files/sbin/sysupgrade3
2 files changed, 3 insertions, 2 deletions
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 8138f1cd4d..5957f1406b 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=base-files
-PKG_RELEASE:=33
+PKG_RELEASE:=34
PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
diff --git a/package/base-files/files/sbin/sysupgrade b/package/base-files/files/sbin/sysupgrade
index a582d432f8..0cf51cfb78 100755
--- a/package/base-files/files/sbin/sysupgrade
+++ b/package/base-files/files/sbin/sysupgrade
@@ -51,7 +51,8 @@ EOF
add_uci_conffiles() {
local file="$1"
- find /etc/config /etc/passwd /etc/group /etc/dropbear /etc/firewall.user /etc/rc.local > "$file"
+ find /etc/config /etc/passwd /etc/group /etc/dropbear \
+ /etc/firewall.user /etc/rc.local -type f > "$file"
return 0
}