diff --git a/package/base-files/Makefile b/package/base-files/Makefile index ab60557f5..7de4af351 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:=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 0cf51cfb7..bf00aaa5f 100755 --- 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 }