From: Jo-Philipp Wich <jow@openwrt.org>
Date: Sat, 23 Oct 2010 15:50:16 +0000 (+0000)
Subject: merge r23590
X-Git-Tag: backfire_10.03.1~521
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=55e1fa6e5ef4e80aa929fbd691ff7eb88b1f9300;p=openwrt%2Fsvn-archive%2Fopenwrt.git

merge r23590

SVN-Revision: 23591
---

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 928a716e18..e9aaf0cfde 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -50,6 +50,7 @@ define Package/base-files/conffiles
 /etc/inittab
 /etc/group
 /etc/passwd
+/etc/shadow
 /etc/profile
 /etc/shells
 /etc/sysctl.conf