[package] block-mount block-extroot: Bump packages versions forgetten during previous...

[15.05/openwrt.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 21af8b0..b0cd903 100644 (file)
--- a/package/block-extroot/files/55_determine_extroot_sysupgrade
+++ b/package/block-extroot/files/55_determine_extroot_sysupgrade
@@ -7,23 +7,31 @@
 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
                er_extroot_md5sum="$(cat $er_md5sum_file)"
        fi
 
+       local er_overlay_file="${ER_OVERLAY_ROM}/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
-               mount --move /overlay /tmp/overlay-disabled
+               mkdir -p $er_disabled
+               mount --move ${ER_OVERLAY_ROM} $er_disabled
        fi
 }