init: conditionally unmount /update after a failed update

This commit is contained in:
MilhouseVH 2019-10-17 18:13:07 +01:00
parent 31cb9c012a
commit 399fe7ee80

View File

@ -671,6 +671,10 @@ check_out_of_space() {
do_cleanup() { do_cleanup() {
StartProgress spinner "Cleaning up... " StartProgress spinner "Cleaning up... "
if mountpoint -q /update; then
umount /update
fi
if [ -d $UPDATE_ROOT/.tmp/mnt ]; then if [ -d $UPDATE_ROOT/.tmp/mnt ]; then
if mountpoint -q $UPDATE_ROOT/.tmp/mnt ; then if mountpoint -q $UPDATE_ROOT/.tmp/mnt ; then
# busybox umount deletes loop device automatically # busybox umount deletes loop device automatically
@ -932,7 +936,6 @@ check_update() {
umount /sysroot umount /sysroot
update_file "System" "$UPDATE_SYSTEM" "/flash/$IMAGE_SYSTEM" update_file "System" "$UPDATE_SYSTEM" "/flash/$IMAGE_SYSTEM"
update_bootloader update_bootloader
umount /update
do_cleanup do_cleanup
do_reboot do_reboot
} }