[package] block-mount block-extroot: Rename /tmp/rom-disabled to /tmp/whole_root...

[openwrt/svn-archive/archive.git] / package / block-extroot / files / 55_determine_extroot_sysupgrade

diff --git a/package/block-extroot/files/55_determine_extroot_sysupgrade b/package/block-extroot/files/55_determine_extroot_sysupgrade
index d458b63bb1c3505991be2b0762c967be59011d8b..b0cd9036c2b68d3955adadcc2b07c86462f3c75c 100644 (file)
--- 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
 }