浏览代码

block-extroot: Fixed the functionality that disables the extroot after a firmware upgrade (which is necessary because of possible kernel version or uClibc version conflicts). It was implented but actually failed to disable extroot when it should have. This commit fixes that.

SVN-Revision: 25269
Daniel Dickinson 14 年之前
父节点
当前提交
3fa871cb4b
共有 1 个文件被更改,包括 5 次插入3 次删除
  1. 5 3
      package/block-extroot/files/55_determine_extroot_sysupgrade

+ 5 - 3
package/block-extroot/files/55_determine_extroot_sysupgrade

@@ -13,13 +13,15 @@ check_set_md5sum() {
 		er_extroot_md5sum="$(cat $er_md5sum_file)"
 	fi
 
+	local er_overlay_file="/overlay/etc/extroot.md5sum"
+
 	local er_extroot_overlay_md5sum
-	if [ -f "/overlay/etc/extroot.md5sum" ]; then
-		er_extroot_overlay_md5sum="$(cat /overlay/.extroot.md5sum)"
+	if [ -f "$er_overlay_file" ]; then
+		er_extroot_overlay_md5sum="$(cat $er_overlay_file)"
 	fi
 
 	if [ -z "$er_extroot_overlay_md5sum" ]; then
-		cat $er_md5sum_file >/overlay/.extroot.md5sum
+		cat $er_md5sum_file >$er_overlay_file
 	elif [ "$er_extroot_overlay_md5sum" != "$er_extroot_md5sum" ]; then
 		pi_extroot_mount_success="false"
 		mkdir -p /tmp/overlay-disabled