[backfire] package/base-files: merge r28799

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

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 63bae5753f0602602f53f8379d833cfbb32a1231..3b4830dcf11f27a26a583cd6eec75242b66c9491 100644 (file)
--- 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 bc6309df50b12074a28bd8e2ff5a3df8a2a620d9..761c74a1635b9196631fa3c45b824707f240520e 100644 (file)
--- 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