[backfire] merge r22377

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

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 24169afeca5cba00dd5017db3df3f0f655eab07d..11431669ed184a3a4b0aa0d5b3160f149c8eac74 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.2
+PKG_RELEASE:=43.3
 
 PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
 

diff --git a/package/base-files/files/lib/preinit/40_mount_jffs2 b/package/base-files/files/lib/preinit/40_mount_jffs2
index cb743ea75cc9861f28ca6f25339a2992a8d5ac45..d2f05b02ce342adf3f63aa6b3dde870408f5dfa0 100644 (file)
--- a/package/base-files/files/lib/preinit/40_mount_jffs2
+++ b/package/base-files/files/lib/preinit/40_mount_jffs2
@@ -5,6 +5,7 @@
 find_mount_jffs2() {
        mkdir -p /tmp/overlay
     mount "$(find_mtd_part rootfs_data)" /tmp/overlay -t jffs2
+    mtd -qq unlock rootfs_data
 }
 
 jffs2_not_mounted() {