diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2009-11-20 23:02:35 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2009-11-20 23:02:35 +0000 |
| commit | 8151a5f6daad1cc7a7970c52f8473b903807e591 (patch) | |
| tree | 8b0a2bce0474e18b547c9d235f8360ba39c59f53 | |
| parent | 6e68fac20692f9ea0bbdb1fec60b5b0daa89b654 (diff) | |
| download | upstream-8151a5f6daad1cc7a7970c52f8473b903807e591.tar.gz upstream-8151a5f6daad1cc7a7970c52f8473b903807e591.tar.bz2 upstream-8151a5f6daad1cc7a7970c52f8473b903807e591.zip | |
[package] base-files: sysupgrade: restrict find command to plain files to avoid duplicates when generating the conffiles tgz archive
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@18455 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | package/base-files/Makefile | 2 | ||||
| -rwxr-xr-x | 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 } |