From: Nicolas Thill <nico@openwrt.org>
Date: Tue, 15 Nov 2011 01:58:25 +0000 (+0000)
Subject: package/base-files: merge r28799
X-Git-Tag: backfire_10.03.1~52
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=bfa31a0c67f9de6766f18ade3b9fef16ee554560;p=openwrt%2Fsvn-archive%2Fopenwrt.git

package/base-files: merge r28799

SVN-Revision: 29145
---

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 63bae5753f..3b4830dcf1 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.30
+PKG_RELEASE:=43.31
 
 PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
 PKG_BUILD_DEPENDS:=opkg/host
diff --git a/package/base-files/files/etc/passwd b/package/base-files/files/etc/passwd
index bc6309df50..761c74a163 100644
--- a/package/base-files/files/etc/passwd
+++ b/package/base-files/files/etc/passwd
@@ -1,5 +1,5 @@
 root:!:0:0:root:/root:/bin/ash
+daemon:*:1:1:daemon:/var:/bin/false
 ftp:*:55:55:ftp:/home/ftp:/bin/false
 network:*:101:101:network:/var:/bin/false
 nobody:*:65534:65534:nobody:/var:/bin/false
-daemon:*:65534:65534:daemon:/var:/bin/false