From 8a44ee7dab46de336b09cad1f5e89ea2208862af Mon Sep 17 00:00:00 2001 From: cshore Date: Tue, 1 Feb 2011 07:43:21 +0000 Subject: [PATCH] [package]: block-extroot. Merged r25269. Fixed the (wanted) disabling of extroot after a sysupgrade. git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@25270 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../block-extroot/files/55_determine_extroot_sysupgrade | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/package/block-extroot/files/55_determine_extroot_sysupgrade b/package/block-extroot/files/55_determine_extroot_sysupgrade index 21af8b018..5a6ad04f8 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