From: Daniel Dickinson <crazycshore@gmail.com>
Date: Sun, 27 Mar 2011 05:39:47 +0000 (+0000)
Subject: block-mount block-extroot: Rename /tmp/rom-disabled to /tmp/whole_root-dsibled for... 
X-Git-Tag: reboot~17122
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=544d1c045ed90e8ca127632a1951abe231886b3a;p=openwrt%2Fstaging%2Fxback.git

block-mount block-extroot: Rename /tmp/rom-disabled to /tmp/whole_root-dsibled for disabled mounts of a non-overlay external rootfs.

SVN-Revision: 26311
---

diff --git a/package/block-extroot/files/55_determine_extroot_sysupgrade b/package/block-extroot/files/55_determine_extroot_sysupgrade
index d458b63bb1..b0cd9036c2 100644
--- a/package/block-extroot/files/55_determine_extroot_sysupgrade
+++ b/package/block-extroot/files/55_determine_extroot_sysupgrade
@@ -7,6 +7,12 @@
 check_set_md5sum() {
 	local er_md5sum_file
 	er_md5sum_file="${ER_OVERLAY_PREFIX}/.extroot.md5sum"
+	local er_disabled
+	if [ "${ER_OVERLAY_ROM}" = "/rom" ]; then
+		er_disabled=/tmp/whole_root-disabled
+	else
+		er_disabled=/tmp${ER_OVERLAY_ROM}-disabled
+	fi
 
 	local er_extroot_md5sum
 	if [ -f $md5sum_file ]; then
@@ -24,8 +30,8 @@ check_set_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${ER_OVERLAY_ROM}-disabled
-		mount --move ${ER_OVERLAY_ROM} /tmp${ER_OVERLAY_ROM}-disabled
+		mkdir -p $er_disabled
+		mount --move ${ER_OVERLAY_ROM} $er_disabled
 	fi
 }
 
diff --git a/package/block-mount/files/mount.sh b/package/block-mount/files/mount.sh
index d82a927835..e96174ce92 100644
--- a/package/block-mount/files/mount.sh
+++ b/package/block-mount/files/mount.sh
@@ -48,7 +48,7 @@ config_mount_by_section() {
 				    if [ "$is_rootfs" -eq 1 ] || [ "$target" = "/overlay" ]; then
 					target=/tmp/overlay-disabled
 				    elif [ "$target" = "/" ] || [ "$target" = "/rom" ]; then
-					target="/tmp/rom-disabled"
+					target="/tmp/whole_root-disabled"
 				    fi
 				fi