KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
SVN-Revision: 26311
This commit is contained in:
Daniel Dickinson 2011-03-27 05:39:47 +00:00
parent 860c1cc790
commit 544d1c045e
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
package/block-extroot/files/55_determine_extroot_sysupgrade
View file

@ -7,6 +7,12 @@
check_set_md5sum() { check_set_md5sum() {
local er_md5sum_file local er_md5sum_file
er_md5sum_file="${ER_OVERLAY_PREFIX}/.extroot.md5sum" 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 local er_extroot_md5sum
if [ -f $md5sum_file ]; then if [ -f $md5sum_file ]; then
@ -24,8 +30,8 @@ check_set_md5sum() {
cat $er_md5sum_file >$er_overlay_file cat $er_md5sum_file >$er_overlay_file
elif [ "$er_extroot_overlay_md5sum" != "$er_extroot_md5sum" ]; then elif [ "$er_extroot_overlay_md5sum" != "$er_extroot_md5sum" ]; then
pi_extroot_mount_success="false" pi_extroot_mount_success="false"
mkdir -p /tmp${ER_OVERLAY_ROM}-disabled mkdir -p $er_disabled
mount --move ${ER_OVERLAY_ROM} /tmp${ER_OVERLAY_ROM}-disabled mount --move ${ER_OVERLAY_ROM} $er_disabled
fi fi
} }

2
package/block-mount/files/mount.sh
View file

@ -48,7 +48,7 @@ config_mount_by_section() {
if [ "$is_rootfs" -eq 1 ] || [ "$target" = "/overlay" ]; then if [ "$is_rootfs" -eq 1 ] || [ "$target" = "/overlay" ]; then
target=/tmp/overlay-disabled target=/tmp/overlay-disabled
elif [ "$target" = "/" ] || [ "$target" = "/rom" ]; then elif [ "$target" = "/" ] || [ "$target" = "/rom" ]; then
target="/tmp/rom-disabled" target="/tmp/whole_root-disabled"
fi fi
fi fi