From: Daniel Dickinson <crazycshore@gmail.com>
Date: Tue, 1 Feb 2011 06:28:59 +0000 (+0000)
Subject: block-extroot: Fixed the functionality that disables the extroot after a firmware... 
X-Git-Tag: reboot~17704
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=3fa871cb4badc5d5219ec0eb5829c529c8c81a1f;p=openwrt%2Fstaging%2Fxback.git

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
---

diff --git a/package/block-extroot/files/55_determine_extroot_sysupgrade b/package/block-extroot/files/55_determine_extroot_sysupgrade
index 21af8b0180..5a6ad04f89 100644
--- a/package/block-extroot/files/55_determine_extroot_sysupgrade
+++ b/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