OmniNX/OmniNX-Installer-Payload
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Clean install: use normal switch copy, not .offload-aware"

Browse Source 
This reverts commit 335ea03b05.
This commit is contained in:
Niklas Friesen
2026-03-05 17:24:26 +01:00
parent 335ea03b05
commit f943887b39
4 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/install.c
View File

@@ -764,7 +764,7 @@ int perform_installation(omninx_variant_t pack_variant, install_mode_t mode) {
install_set_color(COLOR_YELLOW); install_set_color(COLOR_YELLOW);
gfx_printf("Schritt 2: Dateien kopieren...\n"); gfx_printf("Schritt 2: Dateien kopieren...\n");
install_set_color(COLOR_WHITE); install_set_color(COLOR_WHITE);
res = update_mode_install(pack_variant, true); res = update_mode_install(pack_variant);
if (res != FR_OK) return res; if (res != FR_OK) return res;
install_check_and_clear_screen_if_needed(); install_check_and_clear_screen_if_needed();

3
source/install.h
View File

@@ -18,8 +18,7 @@ int perform_installation(omninx_variant_t pack_variant, install_mode_t mode);
// Update mode operations (install_update.c) // Update mode operations (install_update.c)
int update_mode_cleanup(omninx_variant_t variant); int update_mode_cleanup(omninx_variant_t variant);
/* offload_aware_switch: true = update (preserve .offload), false = clean (normal copy) */ int update_mode_install(omninx_variant_t variant);
int update_mode_install(omninx_variant_t variant, bool offload_aware_switch);
int cleanup_staging_directory(omninx_variant_t pack_variant); int cleanup_staging_directory(omninx_variant_t pack_variant);
// Remove other OmniNX staging directories (Standard/Light/OC) that exist, except the one just installed // Remove other OmniNX staging directories (Standard/Light/OC) that exist, except the one just installed
int cleanup_other_staging_directories(omninx_variant_t installed_variant); int cleanup_other_staging_directories(omninx_variant_t installed_variant);

4
source/install_clean.c
View File

@@ -107,9 +107,9 @@ int clean_mode_restore(void) {
return res; return res;
} }
// Clean mode: Install files (reuse update copy logic, but normal switch copy – no .offload preservation) // Clean mode: Install files (reuse update mode install)
int clean_mode_install(omninx_variant_t variant) { int clean_mode_install(omninx_variant_t variant) {
return update_mode_install(variant, false); return update_mode_install(variant);
} }
// Remove other staging directories (OmniNX Standard/Light/OC) that exist on SD // Remove other staging directories (OmniNX Standard/Light/OC) that exist on SD

10
source/install_update.c
View File

@@ -73,9 +73,8 @@ int update_mode_cleanup(omninx_variant_t variant) {
return FR_OK; return FR_OK;
} }
// Update/Clean mode: Copy files from staging. // Update mode: Copy files from staging
// offload_aware_switch: true = update (preserve .overlays/.offload, .packages/.offload); false = clean (normal copy). int update_mode_install(omninx_variant_t variant) {
int update_mode_install(omninx_variant_t variant, bool offload_aware_switch) {
int res; int res;
const char* staging = get_staging_path(variant); const char* staging = get_staging_path(variant);
char src_path[256]; char src_path[256];
@@ -104,10 +103,7 @@ int update_mode_install(omninx_variant_t variant, bool offload_aware_switch) {
if (res != FR_OK && res != FR_NO_FILE) return res; if (res != FR_OK && res != FR_NO_FILE) return res;
s_printf(src_path, "%s/switch", staging); s_printf(src_path, "%s/switch", staging);
if (offload_aware_switch) res = folder_copy_switch_update_offload_aware(src_path, "sd:/", "switch/");
res = folder_copy_switch_update_offload_aware(src_path, "sd:/", "switch/");
else
res = folder_copy_with_progress_v2(src_path, "sd:/", "switch/");
if (res != FR_OK && res != FR_NO_FILE) return res; if (res != FR_OK && res != FR_NO_FILE) return res;
s_printf(src_path, "%s/warmboot_mariko", staging); s_printf(src_path, "%s/warmboot_mariko", staging);