From 4d9b1d6c756b76e037285a7519c4ec20014aa654 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Fri, 20 Nov 2009 23:02:35 +0000 Subject: [PATCH] base-files: sysupgrade: restrict find command to plain files to avoid duplicates when generating the conffiles tgz archive SVN-Revision: 18455 --- package/base-files/Makefile | 2 +- package/base-files/files/sbin/sysupgrade | 3 ++- 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 } -- 2.30.2