From: Daniel Dickinson <crazycshore@gmail.com>
Date: Tue, 1 Feb 2011 07:43:21 +0000 (+0000)
Subject: block-extroot. Merged r25269. Fixed the (wanted) disabling of extroot after a sysupgrade.
X-Git-Tag: backfire_10.03.1~395
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=975813773322281954580f1b578de8b367a2faa5;p=openwrt%2Fsvn-archive%2Fopenwrt.git

block-extroot. Merged r25269. Fixed the (wanted) disabling of extroot after a sysupgrade.

SVN-Revision: 25270
---

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