From: Jo-Philipp Wich <jow@openwrt.org>
Date: Tue, 5 Oct 2010 07:40:25 +0000 (+0000)
Subject: base-files: sysupgrade: merge info from "opkg list-changed-conffiles" to backup file... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=978ecae6855efdd2806c2975b85b22c9b2833862;p=openwrt%2Fstaging%2Fjow.git

base-files: sysupgrade: merge info from "opkg list-changed-conffiles" to backup file list

SVN-Revision: 23233
---

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index f290e79a06..9598823cb1 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=base-files
-PKG_RELEASE:=57
+PKG_RELEASE:=58
 
 PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
 PKG_BUILD_DEPENDS:=opkg/host
diff --git a/package/base-files/files/sbin/sysupgrade b/package/base-files/files/sbin/sysupgrade
index 0fb07530e4..1210e6e509 100755
--- a/package/base-files/files/sbin/sysupgrade
+++ b/package/base-files/files/sbin/sysupgrade
@@ -55,8 +55,9 @@ EOF
 
 add_uci_conffiles() {
 	local file="$1"
-	find /etc/config /etc/passwd /etc/group /etc/dropbear \
-		/etc/firewall.user /etc/rc.local -type f > "$file"
+	( find /etc/config /etc/passwd /etc/group /etc/dropbear \
+		/etc/firewall.user /etc/rc.local -type f;
+	  opkg list-changed-conffiles ) | sort -u > "$file"
 	return 0
 }