[backfire] merge r23264

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

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 1478d8a194a2c21b776f45972602fa94482fb7df..928a716e1889159326a94fc2d3636ab70e5682b9 100644 (file)
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -54,6 +54,7 @@ define Package/base-files/conffiles
 /etc/shells
 /etc/sysctl.conf
 /etc/rc.local
+/etc/sysupgrade.conf
 /etc/config/
 /etc/dropbear/
 $(call $(TARGET)/conffiles)