From: jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Thu, 7 Oct 2010 15:23:49 +0000 (+0000)
Subject: [backfire] merge r23264
X-Git-Url: http://207.154.207.93/?a=commitdiff_plain;h=f80781773cdf8f703da3ab80cc78d7f7363ae254;p=10.03%2Fopenwrt.git

[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 1478d8a19..928a716e1 100644
--- 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)