diff options
| author | Daniel Dickinson <daniel@cshore.neomailbox.net> | 2011-02-01 06:28:59 +0000 |
|---|---|---|
| committer | Daniel Dickinson <daniel@cshore.neomailbox.net> | 2011-02-01 06:28:59 +0000 |
| commit | 131d1c0c2b656ff843cf06972025d140f6540443 (patch) | |
| tree | 20b8a00203a9a99c017683652eca4b1eb0f52280 | |
| parent | 1b78486511b72f8ffad937bb456fc7a924e71225 (diff) | |
| download | master-187ad058-131d1c0c2b656ff843cf06972025d140f6540443.tar.gz master-187ad058-131d1c0c2b656ff843cf06972025d140f6540443.tar.bz2 master-187ad058-131d1c0c2b656ff843cf06972025d140f6540443.zip | |
[package]: block-extroot: Fixed the functionality that disables the extroot after a firmware upgrade (which is necessary because of possible kernel version or uClibc version conflicts). It was implented but actually failed to disable extroot when it should have. This commit fixes that.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@25269 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | package/block-extroot/files/55_determine_extroot_sysupgrade | 8 |
1 files 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 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 |