[backfire] merge r23232 and r23233

git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@23236 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index ab60557f5e90f28bf19eb90b5d49669f0a81672b..7de4af351c5a26a3a8b708efe20f489906a4f1d5 100644 (file)
--- 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:=43.5
+PKG_RELEASE:=43.6
 
 PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
 PKG_BUILD_DEPENDS:=opkg/host
@@ -53,6 +53,7 @@ define Package/base-files/conffiles
 /etc/profile
 /etc/shells
 /etc/sysctl.conf
+/etc/rc.local
 $(call $(TARGET)/conffiles)
 endef
 

diff --git a/package/base-files/files/sbin/sysupgrade b/package/base-files/files/sbin/sysupgrade
index 0cf51cfb78692686766b14ba145ff3a92c5fae4f..bf00aaa5f811f7b61fb1f43bf46e092e1a695443 100755 (executable)
--- a/package/base-files/files/sbin/sysupgrade
+++ b/package/base-files/files/sbin/sysupgrade
@@ -51,8 +51,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
 }