diff options
Diffstat (limited to 'applications/updater/util/update_task_worker_backup.c')
| -rw-r--r-- | applications/updater/util/update_task_worker_backup.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/applications/updater/util/update_task_worker_backup.c b/applications/updater/util/update_task_worker_backup.c index 1e8c2f09..09e45953 100644 --- a/applications/updater/util/update_task_worker_backup.c +++ b/applications/updater/util/update_task_worker_backup.c @@ -4,6 +4,7 @@ #include <furi.h> #include <furi_hal.h> #include <storage/storage.h> +#include <desktop/helpers/slideshow_filename.h> #include <toolbox/path.h> #include <update_util/dfu_file.h> #include <update_util/lfs_backup.h> @@ -18,8 +19,6 @@ break; \ } -#define EXT_PATH "/ext" - static bool update_task_pre_update(UpdateTask* update_task) { bool success = false; string_t backup_file_path; @@ -89,7 +88,7 @@ static bool update_task_post_update(UpdateTask* update_task) { progress.total_files = tar_archive_get_entries_count(archive); if(progress.total_files > 0) { - CHECK_RESULT(tar_archive_unpack_to(archive, EXT_PATH)); + CHECK_RESULT(tar_archive_unpack_to(archive, STORAGE_EXT_PATH_PREFIX, NULL)); } } @@ -99,7 +98,9 @@ static bool update_task_post_update(UpdateTask* update_task) { string_init_set(tmp_path, update_task->update_path); path_append(tmp_path, string_get_cstr(update_task->manifest->splash_file)); if(storage_common_copy( - update_task->storage, string_get_cstr(tmp_path), "/int/slideshow") != FSE_OK) { + update_task->storage, + string_get_cstr(tmp_path), + INT_PATH(SLIDESHOW_FILE_NAME)) != FSE_OK) { // actually, not critical } string_clear(tmp_path); @@ -129,10 +130,6 @@ int32_t update_task_worker_backup_restore(void* context) { break; } - /* Waiting for BT service to 'start', so we don't race for boot mode flag */ - furi_record_open("bt"); - furi_record_close("bt"); - if(boot_mode == FuriHalRtcBootModePreUpdate) { success = update_task_pre_update(update_task); } else if(boot_mode == FuriHalRtcBootModePostUpdate) { |