[FL-2675] /int space reservation (#1448)
* storage: added global #defines for /int, /ext & /any * storage: introduced PATH_EXT, PATH_INT& PATH_ANY macros * core apps: moved hardcoded config files names to separate headers; prefixed them with "."; updater: added file name migration to new naming convention on backup extraction * storage: fixed storage_merge_recursive handling of complex directory structures; storage_move_to_sd: changed data migration logic to all non-dot files & all folders * core: added macro aliases for core record names * Bumped protobuf commit pointer * storage: reserved 5 pages in /int; denying write&creation of non-dot files when running out of free space Co-authored-by: あく <alleteam@gmail.com>
This commit is contained in:
@@ -211,7 +211,7 @@ UpdateTask* update_task_alloc() {
|
||||
string_init(update_task->state.status);
|
||||
|
||||
update_task->manifest = update_manifest_alloc();
|
||||
update_task->storage = furi_record_open("storage");
|
||||
update_task->storage = furi_record_open(RECORD_STORAGE);
|
||||
update_task->file = storage_file_alloc(update_task->storage);
|
||||
update_task->status_change_cb = NULL;
|
||||
update_task->boot_mode = furi_hal_rtc_get_boot_mode();
|
||||
@@ -246,7 +246,7 @@ void update_task_free(UpdateTask* update_task) {
|
||||
storage_file_free(update_task->file);
|
||||
update_manifest_free(update_task->manifest);
|
||||
|
||||
furi_record_close("storage");
|
||||
furi_record_close(RECORD_STORAGE);
|
||||
string_clear(update_task->update_path);
|
||||
|
||||
free(update_task);
|
||||
|
@@ -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) {
|
||||
|
Reference in New Issue
Block a user