Compare commits
4 Commits
82639a7a86
...
dce11538d1
| Author | SHA1 | Date | |
|---|---|---|---|
| dce11538d1 | |||
| 21f8e0e38a | |||
| 0ad2c63123 | |||
| 6780936d2d |
90
DEBUG_INI.md
Normal file
90
DEBUG_INI.md
Normal file
@@ -0,0 +1,90 @@
|
|||||||
|
# Debug configuration (`debug.ini`)
|
||||||
|
|
||||||
|
Optional file to **skip parts of the install** for testing (e.g. run only deletion and inspect the SD card). If the file is **missing**, the installer ignores debug entirely and runs the full flow.
|
||||||
|
|
||||||
|
## Location
|
||||||
|
|
||||||
|
```
|
||||||
|
sd:/config/omninx/debug.ini
|
||||||
|
```
|
||||||
|
|
||||||
|
Create the folder `sd:/config/omninx/` on the SD card if it does not exist. Same parent directory as `manifest.ini` and `ram_config.ini`.
|
||||||
|
|
||||||
|
## Format
|
||||||
|
|
||||||
|
- Section name must be exactly **`[Debug]`** (case-sensitive in the parser).
|
||||||
|
- One key per line: `name=value`.
|
||||||
|
- **Enabling a skip:** set the value so it **starts** with one of: `1`, `t`, `T`, `y`, `Y`
|
||||||
|
Examples: `1`, `true`, `yes`, `True` — all enable that skip.
|
||||||
|
- **Disabling:** `0`, `false`, `no`, or omit the key.
|
||||||
|
|
||||||
|
## Parameters
|
||||||
|
|
||||||
|
### Clean install mode (`INSTALL_MODE_CLEAN`)
|
||||||
|
|
||||||
|
| Key | What is skipped |
|
||||||
|
|-----|-----------------|
|
||||||
|
| `skip_clean_backup` | Step 1 — backup of `sd:/switch/DBI/dbi.config`, `sd:/switch/prod.keys` to `sd:/temp_backup` |
|
||||||
|
| `skip_clean_wipe` | Step 2 — all cleanup from `deletion_lists_clean.h` (deletion / wipe) |
|
||||||
|
| `skip_clean_restore` | Step 3 — restore from `sd:/temp_backup` and post-restore paths (e.g. delete `sd:/switch/tinfoil/db`) |
|
||||||
|
| `skip_clean_install` | Step 4 — copy files from the OmniNX staging folder to the SD root |
|
||||||
|
| `skip_clean_staging_cleanup` | After install: do not remove the staging directory or other variant staging folders |
|
||||||
|
|
||||||
|
### Update mode (`INSTALL_MODE_UPDATE`)
|
||||||
|
|
||||||
|
| Key | What is skipped |
|
||||||
|
|-----|-----------------|
|
||||||
|
| `skip_update_cleanup` | Step 1 — selective deletion from `deletion_lists_update.h` |
|
||||||
|
| `skip_update_install` | Step 2 — copy from staging to SD |
|
||||||
|
| `skip_update_staging_cleanup` | End: do not remove staging / other variant folders |
|
||||||
|
| `skip_update_horizon_oc` | **OC variant only:** HorizonOC config backup before update, restore and cleanup after (entire HorizonOC update side path) |
|
||||||
|
|
||||||
|
### Both modes
|
||||||
|
|
||||||
|
| Key | What is skipped |
|
||||||
|
|-----|-----------------|
|
||||||
|
| `skip_hekate_8gb_post_copy` | After a successful copy: the optional `hekate_8GB` / RAM menu and related file moves (see `install_hekate_8gb_post_copy` in `install.c`) |
|
||||||
|
|
||||||
|
## Behaviour
|
||||||
|
|
||||||
|
- On startup, if `debug.ini` exists and parses successfully, the payload prints a **DEBUG-MODUS** banner listing which skips are active.
|
||||||
|
- If the file is absent, unreadable, or has no `[Debug]` section, **no** skips apply — behaviour matches a release install.
|
||||||
|
- Skipping steps can leave the SD in an inconsistent state; this is **for developers/testers only**.
|
||||||
|
|
||||||
|
## Examples
|
||||||
|
|
||||||
|
### Wipe only (test deletion, no backup/restore/copy)
|
||||||
|
|
||||||
|
Inspect leftovers after the clean-install wipe, without backing up, restoring, installing, or cleaning staging:
|
||||||
|
|
||||||
|
```ini
|
||||||
|
[Debug]
|
||||||
|
skip_clean_backup=1
|
||||||
|
skip_clean_restore=1
|
||||||
|
skip_clean_install=1
|
||||||
|
skip_clean_staging_cleanup=1
|
||||||
|
skip_hekate_8gb_post_copy=1
|
||||||
|
```
|
||||||
|
|
||||||
|
Do **not** set `skip_clean_wipe` (leave unset or `0`).
|
||||||
|
|
||||||
|
### Update: deletion only
|
||||||
|
|
||||||
|
```ini
|
||||||
|
[Debug]
|
||||||
|
skip_update_install=1
|
||||||
|
skip_update_staging_cleanup=1
|
||||||
|
skip_hekate_8gb_post_copy=1
|
||||||
|
```
|
||||||
|
|
||||||
|
### OC update without touching HorizonOC backup/restore
|
||||||
|
|
||||||
|
```ini
|
||||||
|
[Debug]
|
||||||
|
skip_update_horizon_oc=1
|
||||||
|
```
|
||||||
|
|
||||||
|
## Implementation
|
||||||
|
|
||||||
|
- Parsed in `install.c`: `install_debug_load()`, `perform_installation()`.
|
||||||
|
- Uses the same INI parser as `ram_config.ini` (`ini_parse` from BDK).
|
||||||
@@ -2,6 +2,8 @@
|
|||||||
|
|
||||||
This document provides a detailed, step-by-step breakdown of everything that is checked and done during the OmniNX installation/update process.
|
This document provides a detailed, step-by-step breakdown of everything that is checked and done during the OmniNX installation/update process.
|
||||||
|
|
||||||
|
For **optional debug step skips** (`sd:/config/omninx/debug.ini`), see **[DEBUG_INI.md](DEBUG_INI.md)**.
|
||||||
|
|
||||||
## Overview
|
## Overview
|
||||||
|
|
||||||
The OmniNX Installer Payload operates in two modes:
|
The OmniNX Installer Payload operates in two modes:
|
||||||
@@ -305,17 +307,12 @@ channel_pack={variant} # Same as current_pack
|
|||||||
#### 32. Create Backup Directory
|
#### 32. Create Backup Directory
|
||||||
- Creates `sd:/temp_backup/` directory
|
- Creates `sd:/temp_backup/` directory
|
||||||
|
|
||||||
#### 33. Backup DBI
|
#### 33. Backup DBI settings
|
||||||
- **Source**: `sd:/switch/DBI/`
|
- **Source**: `sd:/switch/DBI/dbi.config` (file only, not the whole `DBI` tree)
|
||||||
- **Destination**: `sd:/temp_backup/DBI/`
|
- **Destination**: `sd:/temp_backup/dbi.config`
|
||||||
- Only if source exists
|
- Only if the source file exists
|
||||||
|
|
||||||
#### 34. Backup Tinfoil
|
#### 34. Backup prod.keys
|
||||||
- **Source**: `sd:/switch/tinfoil/`
|
|
||||||
- **Destination**: `sd:/temp_backup/tinfoil/`
|
|
||||||
- Only if source exists
|
|
||||||
|
|
||||||
#### 35. Backup prod.keys
|
|
||||||
- **Source**: `sd:/switch/prod.keys`
|
- **Source**: `sd:/switch/prod.keys`
|
||||||
- **Destination**: `sd:/temp_backup/prod.keys`
|
- **Destination**: `sd:/temp_backup/prod.keys`
|
||||||
- Only if source exists
|
- Only if source exists
|
||||||
@@ -325,22 +322,22 @@ channel_pack={variant} # Same as current_pack
|
|||||||
### Step 2: Wipe Directories
|
### Step 2: Wipe Directories
|
||||||
**Location**: `install.c:543-602`
|
**Location**: `install.c:543-602`
|
||||||
|
|
||||||
#### 36. Delete Entire Directories
|
#### 35. Delete Entire Directories
|
||||||
Recursively deletes (if they exist):
|
Recursively deletes (if they exist):
|
||||||
- `sd:/atmosphere/` (entire directory tree)
|
- `sd:/atmosphere/` (entire directory tree)
|
||||||
- `sd:/bootloader/` (entire directory tree)
|
- `sd:/bootloader/` (entire directory tree)
|
||||||
- `sd:/config/` (entire directory tree)
|
- `sd:/config/` (entire directory tree)
|
||||||
- `sd:/switch/` (entire directory tree)
|
- `sd:/switch/` (entire directory tree)
|
||||||
|
|
||||||
#### 37. Delete Root Files
|
#### 36. Delete Root Files
|
||||||
- Uses same deletion list as update mode (Step 19)
|
- Uses same deletion list as update mode (Step 19)
|
||||||
- Deletes `boot.dat`, `boot.ini`, `exosphere.ini`, etc.
|
- Deletes `boot.dat`, `boot.ini`, `exosphere.ini`, etc.
|
||||||
|
|
||||||
#### 38. Delete Miscellaneous Items
|
#### 37. Delete Miscellaneous Items
|
||||||
- Uses same deletion lists as update mode (Steps 20-21)
|
- Uses same deletion lists as update mode (Steps 20-21)
|
||||||
- Deletes `argon/`, `games/`, `SaltySD/`, etc.
|
- Deletes `argon/`, `games/`, `SaltySD/`, etc.
|
||||||
|
|
||||||
#### 39. Recreate Switch Directory
|
#### 38. Recreate Switch Directory
|
||||||
- Creates empty `sd:/switch/` directory for restoration
|
- Creates empty `sd:/switch/` directory for restoration
|
||||||
|
|
||||||
---
|
---
|
||||||
@@ -348,27 +345,17 @@ Recursively deletes (if they exist):
|
|||||||
### Step 3: Restore User Data
|
### Step 3: Restore User Data
|
||||||
**Location**: `backup.c:55-95`
|
**Location**: `backup.c:55-95`
|
||||||
|
|
||||||
#### 40. Restore DBI
|
#### 39. Restore DBI settings
|
||||||
- **Source**: `sd:/temp_backup/DBI/`
|
- **Source**: `sd:/temp_backup/dbi.config`
|
||||||
- **Destination**: `sd:/switch/DBI/`
|
- **Destination**: `sd:/switch/DBI/dbi.config` (creates `sd:/switch/DBI/` if needed)
|
||||||
- **Cleanup**: After restoration, deletes old DBI NRO files:
|
- No longer copies the full `DBI` folder; old `.nro` cleanup is unnecessary
|
||||||
- `sd:/switch/DBI/DBI_810_EN.nro`
|
|
||||||
- `sd:/switch/DBI/DBI_810_DE.nro`
|
|
||||||
- `sd:/switch/DBI/DBI_845_EN.nro`
|
|
||||||
- `sd:/switch/DBI/DBI_845_DE.nro`
|
|
||||||
- `sd:/switch/DBI/DBI.nro`
|
|
||||||
|
|
||||||
#### 41. Restore Tinfoil
|
#### 40. Restore prod.keys
|
||||||
- **Source**: `sd:/temp_backup/tinfoil/`
|
|
||||||
- **Destination**: `sd:/switch/tinfoil/`
|
|
||||||
- **Cleanup**: After restoration, deletes `sd:/switch/tinfoil/tinfoil.nro`
|
|
||||||
|
|
||||||
#### 42. Restore prod.keys
|
|
||||||
- **Source**: `sd:/temp_backup/prod.keys`
|
- **Source**: `sd:/temp_backup/prod.keys`
|
||||||
- **Destination**: `sd:/switch/prod.keys`
|
- **Destination**: `sd:/switch/prod.keys`
|
||||||
|
|
||||||
#### 43. Cleanup Backup Directory
|
#### 41. Cleanup Backup Directory
|
||||||
**Location**: `backup.c:98-103`
|
**Location**: `backup.c` (`cleanup_backup`)
|
||||||
- Deletes `sd:/temp_backup/` directory after restoration
|
- Deletes `sd:/temp_backup/` directory after restoration
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ Based on [HATS-Installer-Payload](https://github.com/sthetix/HATS-Installer-Payl
|
|||||||
- **Automatic Variant Detection**: Detects which OmniNX pack variant is present (Standard/Light/OC)
|
- **Automatic Variant Detection**: Detects which OmniNX pack variant is present (Standard/Light/OC)
|
||||||
- **Smart Installation Modes**:
|
- **Smart Installation Modes**:
|
||||||
- **Update Mode**: Selective deletion when OmniNX is already installed
|
- **Update Mode**: Selective deletion when OmniNX is already installed
|
||||||
- **Clean Install**: Full wipe with backup/restore of user data (DBI, Tinfoil, prod.keys)
|
- **Clean Install**: Full wipe with backup/restore of user data (DBI `dbi.config`, prod.keys)
|
||||||
- **Version Detection**: Detects installed OmniNX version via marker files (`1.0.0s`, `1.0.0l`, `1.0.0oc`)
|
- **Version Detection**: Detects installed OmniNX version via marker files (`1.0.0s`, `1.0.0l`, `1.0.0oc`)
|
||||||
- **Progress Display**: Visual status messages during installation
|
- **Progress Display**: Visual status messages during installation
|
||||||
- **Error Handling**: Detailed error reporting on screen
|
- **Error Handling**: Detailed error reporting on screen
|
||||||
@@ -22,6 +22,7 @@ Based on [HATS-Installer-Payload](https://github.com/sthetix/HATS-Installer-Payl
|
|||||||
|
|
||||||
For detailed information about the installation process, see:
|
For detailed information about the installation process, see:
|
||||||
- **[INSTALLATION_PROCESS.md](INSTALLATION_PROCESS.md)** - Complete step-by-step breakdown of everything checked and done during installation/update
|
- **[INSTALLATION_PROCESS.md](INSTALLATION_PROCESS.md)** - Complete step-by-step breakdown of everything checked and done during installation/update
|
||||||
|
- **[DEBUG_INI.md](DEBUG_INI.md)** - Optional `sd:/config/omninx/debug.ini` parameters to skip install steps (for testing)
|
||||||
|
|
||||||
## Installation Modes
|
## Installation Modes
|
||||||
|
|
||||||
@@ -35,8 +36,7 @@ For detailed information about the installation process, see:
|
|||||||
- Detected when no version marker files are found
|
- Detected when no version marker files are found
|
||||||
- Performs full wipe of `/atmosphere`, `/bootloader`, `/config`, and `/switch`
|
- Performs full wipe of `/atmosphere`, `/bootloader`, `/config`, and `/switch`
|
||||||
- **Backs up and restores**:
|
- **Backs up and restores**:
|
||||||
- `sd:/switch/DBI` → preserved
|
- `sd:/switch/DBI/dbi.config` → preserved (not the whole `DBI` folder)
|
||||||
- `sd:/switch/tinfoil` → preserved
|
|
||||||
- `sd:/switch/prod.keys` → preserved
|
- `sd:/switch/prod.keys` → preserved
|
||||||
- Fresh installation of all CFW components
|
- Fresh installation of all CFW components
|
||||||
|
|
||||||
|
|||||||
@@ -24,17 +24,9 @@ int backup_user_data(void) {
|
|||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Backup DBI if it exists
|
// Backup DBI settings file only (not .nro installers)
|
||||||
if (path_exists("sd:/switch/DBI")) {
|
if (path_exists(DBI_CONFIG_PATH)) {
|
||||||
res = folder_copy("sd:/switch/DBI", TEMP_BACKUP_PATH);
|
res = file_copy(DBI_CONFIG_PATH, TEMP_BACKUP_DBI_CONFIG);
|
||||||
if (res != FR_OK) {
|
|
||||||
return res;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Backup Tinfoil if it exists
|
|
||||||
if (path_exists("sd:/switch/tinfoil")) {
|
|
||||||
res = folder_copy("sd:/switch/tinfoil", TEMP_BACKUP_PATH);
|
|
||||||
if (res != FR_OK) {
|
if (res != FR_OK) {
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
@@ -61,25 +53,15 @@ int restore_user_data(void) {
|
|||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Restore DBI if backup exists
|
// Restore DBI settings if backed up
|
||||||
if (path_exists("sd:/temp_backup/DBI")) {
|
if (path_exists(TEMP_BACKUP_DBI_CONFIG)) {
|
||||||
res = folder_copy("sd:/temp_backup/DBI", "sd:/switch");
|
res = f_mkdir("sd:/switch/DBI");
|
||||||
if (res == FR_OK) {
|
if (res != FR_OK && res != FR_EXIST) {
|
||||||
// Delete old DBI .nro files
|
return res;
|
||||||
f_unlink("sd:/switch/DBI/DBI_810_EN.nro");
|
|
||||||
f_unlink("sd:/switch/DBI/DBI_810_DE.nro");
|
|
||||||
f_unlink("sd:/switch/DBI/DBI_845_EN.nro");
|
|
||||||
f_unlink("sd:/switch/DBI/DBI_845_DE.nro");
|
|
||||||
f_unlink("sd:/switch/DBI/DBI.nro");
|
|
||||||
}
|
}
|
||||||
}
|
res = file_copy(TEMP_BACKUP_DBI_CONFIG, DBI_CONFIG_PATH);
|
||||||
|
if (res != FR_OK) {
|
||||||
// Restore Tinfoil if backup exists
|
return res;
|
||||||
if (path_exists("sd:/temp_backup/tinfoil")) {
|
|
||||||
res = folder_copy("sd:/temp_backup/tinfoil", "sd:/switch");
|
|
||||||
if (res == FR_OK) {
|
|
||||||
// Delete old tinfoil.nro
|
|
||||||
f_unlink("sd:/switch/tinfoil/tinfoil.nro");
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -7,6 +7,9 @@
|
|||||||
#include <utils/types.h>
|
#include <utils/types.h>
|
||||||
|
|
||||||
#define TEMP_BACKUP_PATH "sd:/temp_backup"
|
#define TEMP_BACKUP_PATH "sd:/temp_backup"
|
||||||
|
/** DBI settings; preserved across clean install (not whole DBI folder). */
|
||||||
|
#define DBI_CONFIG_PATH "sd:/switch/DBI/dbi.config"
|
||||||
|
#define TEMP_BACKUP_DBI_CONFIG TEMP_BACKUP_PATH "/dbi.config"
|
||||||
|
|
||||||
/** Live HorizonOC settings (Overclock tool). */
|
/** Live HorizonOC settings (Overclock tool). */
|
||||||
#define HORIZON_OC_CONFIG_PATH "sd:/config/horizon-oc/config.ini"
|
#define HORIZON_OC_CONFIG_PATH "sd:/config/horizon-oc/config.ini"
|
||||||
@@ -14,7 +17,7 @@
|
|||||||
#define HORIZON_OC_UPDATE_BACKUP_DIR "sd:/.omninx_oc_update"
|
#define HORIZON_OC_UPDATE_BACKUP_DIR "sd:/.omninx_oc_update"
|
||||||
#define HORIZON_OC_UPDATE_BACKUP_INI HORIZON_OC_UPDATE_BACKUP_DIR "/config.ini"
|
#define HORIZON_OC_UPDATE_BACKUP_INI HORIZON_OC_UPDATE_BACKUP_DIR "/config.ini"
|
||||||
|
|
||||||
// Backup user data (DBI, Tinfoil, prod.keys) before clean install
|
// Backup user data (DBI dbi.config, prod.keys) before clean install
|
||||||
int backup_user_data(void);
|
int backup_user_data(void);
|
||||||
|
|
||||||
// Restore user data after clean install
|
// Restore user data after clean install
|
||||||
|
|||||||
@@ -2,8 +2,7 @@
|
|||||||
* OmniNX Installer - Deletion Lists for Clean Install Mode
|
* OmniNX Installer - Deletion Lists for Clean Install Mode
|
||||||
* Deletion policy aligned with NiklasCFW pack clean install (TegraExplorer script):
|
* Deletion policy aligned with NiklasCFW pack clean install (TegraExplorer script):
|
||||||
* full sd:/atmosphere, bootloader/config subsets, sd:/switch, root + misc, then
|
* full sd:/atmosphere, bootloader/config subsets, sd:/switch, root + misc, then
|
||||||
* post-restore paths (e.g. tinfoil db). Backup/restore of DBI, Tinfoil, prod.keys
|
* post-restore paths (e.g. tinfoil db). DBI/prod.keys backup is in backup.c.
|
||||||
* is implemented in backup.c, not here.
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
@@ -114,7 +113,7 @@ static const char* clean_misc_files_to_delete[] = {
|
|||||||
NULL
|
NULL
|
||||||
};
|
};
|
||||||
|
|
||||||
// After DBI/Tinfoil/prod.keys restore (NiklasCFW: deldir("sd:/switch/tinfoil/db"))
|
// After DBI/prod.keys restore (NiklasCFW: deldir("sd:/switch/tinfoil/db"))
|
||||||
static const char* clean_post_restore_dirs_to_delete[] = {
|
static const char* clean_post_restore_dirs_to_delete[] = {
|
||||||
"sd:/switch/tinfoil/db",
|
"sd:/switch/tinfoil/db",
|
||||||
NULL
|
NULL
|
||||||
|
|||||||
192
source/install.c
192
source/install.c
@@ -868,12 +868,120 @@ static void install_hekate_8gb_post_copy(void)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#define INSTALL_DEBUG_INI "sd:/config/omninx/debug.ini"
|
||||||
|
|
||||||
|
typedef struct {
|
||||||
|
bool active;
|
||||||
|
bool skip_clean_backup;
|
||||||
|
bool skip_clean_wipe;
|
||||||
|
bool skip_clean_restore;
|
||||||
|
bool skip_clean_install;
|
||||||
|
bool skip_clean_staging_cleanup;
|
||||||
|
bool skip_update_cleanup;
|
||||||
|
bool skip_update_install;
|
||||||
|
bool skip_update_staging_cleanup;
|
||||||
|
bool skip_update_horizon_oc;
|
||||||
|
bool skip_hekate_8gb_post_copy;
|
||||||
|
} install_debug_opts_t;
|
||||||
|
|
||||||
|
static bool install_ini_truth(const char *val)
|
||||||
|
{
|
||||||
|
if (!val || !val[0])
|
||||||
|
return false;
|
||||||
|
char c = val[0];
|
||||||
|
return c == '1' || c == 't' || c == 'T' || c == 'y' || c == 'Y';
|
||||||
|
}
|
||||||
|
|
||||||
|
static void install_debug_load(install_debug_opts_t *d)
|
||||||
|
{
|
||||||
|
memset(d, 0, sizeof(*d));
|
||||||
|
if (!install_path_exists(INSTALL_DEBUG_INI))
|
||||||
|
return;
|
||||||
|
|
||||||
|
link_t sections;
|
||||||
|
list_init(§ions);
|
||||||
|
if (ini_parse(§ions, (char *)INSTALL_DEBUG_INI, false) != 1) {
|
||||||
|
ram_config_free_sections(§ions);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
LIST_FOREACH_ENTRY(ini_sec_t, sec, §ions, link) {
|
||||||
|
if (!sec->name || strcmp(sec->name, "Debug") != 0)
|
||||||
|
continue;
|
||||||
|
LIST_FOREACH_ENTRY(ini_kv_t, kv, &sec->kvs, link) {
|
||||||
|
if (!kv->key || !kv->val)
|
||||||
|
continue;
|
||||||
|
if (strcmp(kv->key, "skip_clean_backup") == 0)
|
||||||
|
d->skip_clean_backup = install_ini_truth(kv->val);
|
||||||
|
else if (strcmp(kv->key, "skip_clean_wipe") == 0)
|
||||||
|
d->skip_clean_wipe = install_ini_truth(kv->val);
|
||||||
|
else if (strcmp(kv->key, "skip_clean_restore") == 0)
|
||||||
|
d->skip_clean_restore = install_ini_truth(kv->val);
|
||||||
|
else if (strcmp(kv->key, "skip_clean_install") == 0)
|
||||||
|
d->skip_clean_install = install_ini_truth(kv->val);
|
||||||
|
else if (strcmp(kv->key, "skip_clean_staging_cleanup") == 0)
|
||||||
|
d->skip_clean_staging_cleanup = install_ini_truth(kv->val);
|
||||||
|
else if (strcmp(kv->key, "skip_update_cleanup") == 0)
|
||||||
|
d->skip_update_cleanup = install_ini_truth(kv->val);
|
||||||
|
else if (strcmp(kv->key, "skip_update_install") == 0)
|
||||||
|
d->skip_update_install = install_ini_truth(kv->val);
|
||||||
|
else if (strcmp(kv->key, "skip_update_staging_cleanup") == 0)
|
||||||
|
d->skip_update_staging_cleanup = install_ini_truth(kv->val);
|
||||||
|
else if (strcmp(kv->key, "skip_update_horizon_oc") == 0)
|
||||||
|
d->skip_update_horizon_oc = install_ini_truth(kv->val);
|
||||||
|
else if (strcmp(kv->key, "skip_hekate_8gb_post_copy") == 0)
|
||||||
|
d->skip_hekate_8gb_post_copy = install_ini_truth(kv->val);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
ram_config_free_sections(§ions);
|
||||||
|
|
||||||
|
d->active = d->skip_clean_backup || d->skip_clean_wipe || d->skip_clean_restore
|
||||||
|
|| d->skip_clean_install || d->skip_clean_staging_cleanup || d->skip_update_cleanup
|
||||||
|
|| d->skip_update_install || d->skip_update_staging_cleanup || d->skip_update_horizon_oc
|
||||||
|
|| d->skip_hekate_8gb_post_copy;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void install_debug_print_banner(const install_debug_opts_t *d)
|
||||||
|
{
|
||||||
|
if (!d->active)
|
||||||
|
return;
|
||||||
|
install_set_color(COLOR_RED);
|
||||||
|
gfx_printf("*** DEBUG-MODUS: %s ***\n", INSTALL_DEBUG_INI);
|
||||||
|
install_set_color(COLOR_ORANGE);
|
||||||
|
if (d->skip_clean_backup)
|
||||||
|
gfx_printf(" ueberspringe: Clean Schritt 1 (Backup)\n");
|
||||||
|
if (d->skip_clean_wipe)
|
||||||
|
gfx_printf(" ueberspringe: Clean Schritt 2 (Bereinigung)\n");
|
||||||
|
if (d->skip_clean_restore)
|
||||||
|
gfx_printf(" ueberspringe: Clean Schritt 3 (Restore)\n");
|
||||||
|
if (d->skip_clean_install)
|
||||||
|
gfx_printf(" ueberspringe: Clean Schritt 4 (Kopieren)\n");
|
||||||
|
if (d->skip_clean_staging_cleanup)
|
||||||
|
gfx_printf(" ueberspringe: Clean Staging-Aufraeumen\n");
|
||||||
|
if (d->skip_update_cleanup)
|
||||||
|
gfx_printf(" ueberspringe: Update Schritt 1 (Bereinigung)\n");
|
||||||
|
if (d->skip_update_install)
|
||||||
|
gfx_printf(" ueberspringe: Update Schritt 2 (Kopieren)\n");
|
||||||
|
if (d->skip_update_staging_cleanup)
|
||||||
|
gfx_printf(" ueberspringe: Update Staging-Aufraeumen\n");
|
||||||
|
if (d->skip_update_horizon_oc)
|
||||||
|
gfx_printf(" ueberspringe: HorizonOC Update (Backup/Restore)\n");
|
||||||
|
if (d->skip_hekate_8gb_post_copy)
|
||||||
|
gfx_printf(" ueberspringe: hekate 8GB RAM Auswahl / Post-Copy\n");
|
||||||
|
install_set_color(COLOR_WHITE);
|
||||||
|
gfx_printf("\n");
|
||||||
|
}
|
||||||
|
|
||||||
// Main installation function
|
// Main installation function
|
||||||
int perform_installation(omninx_variant_t pack_variant, install_mode_t mode) {
|
int perform_installation(omninx_variant_t pack_variant, install_mode_t mode) {
|
||||||
int res;
|
int res;
|
||||||
|
install_debug_opts_t dbg;
|
||||||
|
install_debug_load(&dbg);
|
||||||
|
install_debug_print_banner(&dbg);
|
||||||
|
|
||||||
if (mode == INSTALL_MODE_UPDATE) {
|
if (mode == INSTALL_MODE_UPDATE) {
|
||||||
if (pack_variant == VARIANT_OC) {
|
if (pack_variant == VARIANT_OC && !dbg.skip_update_horizon_oc) {
|
||||||
bool had_horizon_cfg = install_path_exists(HORIZON_OC_CONFIG_PATH);
|
bool had_horizon_cfg = install_path_exists(HORIZON_OC_CONFIG_PATH);
|
||||||
install_set_color(COLOR_YELLOW);
|
install_set_color(COLOR_YELLOW);
|
||||||
gfx_printf("HorizonOC: Sichere config.ini...\n");
|
gfx_printf("HorizonOC: Sichere config.ini...\n");
|
||||||
@@ -886,26 +994,48 @@ int perform_installation(omninx_variant_t pack_variant, install_mode_t mode) {
|
|||||||
gfx_printf(" [OK] Bestehende config.ini gesichert.\n");
|
gfx_printf(" [OK] Bestehende config.ini gesichert.\n");
|
||||||
install_set_color(COLOR_WHITE);
|
install_set_color(COLOR_WHITE);
|
||||||
}
|
}
|
||||||
|
} else if (pack_variant == VARIANT_OC && dbg.skip_update_horizon_oc) {
|
||||||
|
install_set_color(COLOR_ORANGE);
|
||||||
|
gfx_printf("[DEBUG] HorizonOC Backup uebersprungen.\n");
|
||||||
|
install_set_color(COLOR_WHITE);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Update mode: selective cleanup then install
|
if (!dbg.skip_update_cleanup) {
|
||||||
install_set_color(COLOR_YELLOW);
|
install_set_color(COLOR_YELLOW);
|
||||||
gfx_printf("Schritt 1: Bereinigung...\n");
|
gfx_printf("Schritt 1: Bereinigung...\n");
|
||||||
install_set_color(COLOR_WHITE);
|
install_set_color(COLOR_WHITE);
|
||||||
res = update_mode_cleanup(pack_variant);
|
res = update_mode_cleanup(pack_variant);
|
||||||
if (res != FR_OK) return res;
|
if (res != FR_OK) return res;
|
||||||
|
} else {
|
||||||
|
install_set_color(COLOR_ORANGE);
|
||||||
|
gfx_printf("[DEBUG] Schritt 1 (Bereinigung) uebersprungen.\n");
|
||||||
|
install_set_color(COLOR_WHITE);
|
||||||
|
}
|
||||||
|
|
||||||
install_check_and_clear_screen_if_needed();
|
install_check_and_clear_screen_if_needed();
|
||||||
gfx_printf("\n");
|
gfx_printf("\n");
|
||||||
|
|
||||||
|
if (!dbg.skip_update_install) {
|
||||||
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);
|
res = update_mode_install(pack_variant);
|
||||||
if (res != FR_OK) return res;
|
if (res != FR_OK) return res;
|
||||||
|
} else {
|
||||||
|
install_set_color(COLOR_ORANGE);
|
||||||
|
gfx_printf("[DEBUG] Schritt 2 (Kopieren) uebersprungen.\n");
|
||||||
|
install_set_color(COLOR_WHITE);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!dbg.skip_hekate_8gb_post_copy)
|
||||||
install_hekate_8gb_post_copy();
|
install_hekate_8gb_post_copy();
|
||||||
|
else {
|
||||||
|
install_set_color(COLOR_ORANGE);
|
||||||
|
gfx_printf("[DEBUG] hekate 8GB Post-Copy uebersprungen.\n");
|
||||||
|
install_set_color(COLOR_WHITE);
|
||||||
|
}
|
||||||
|
|
||||||
if (pack_variant == VARIANT_OC) {
|
if (pack_variant == VARIANT_OC && !dbg.skip_update_horizon_oc) {
|
||||||
bool had_horizon_bak = install_path_exists(HORIZON_OC_UPDATE_BACKUP_INI);
|
bool had_horizon_bak = install_path_exists(HORIZON_OC_UPDATE_BACKUP_INI);
|
||||||
install_check_and_clear_screen_if_needed();
|
install_check_and_clear_screen_if_needed();
|
||||||
install_set_color(COLOR_YELLOW);
|
install_set_color(COLOR_YELLOW);
|
||||||
@@ -923,55 +1053,99 @@ int perform_installation(omninx_variant_t pack_variant, install_mode_t mode) {
|
|||||||
res = cleanup_horizon_oc_update_backup();
|
res = cleanup_horizon_oc_update_backup();
|
||||||
if (res != FR_OK)
|
if (res != FR_OK)
|
||||||
return res;
|
return res;
|
||||||
|
} else if (pack_variant == VARIANT_OC && dbg.skip_update_horizon_oc) {
|
||||||
|
install_set_color(COLOR_ORANGE);
|
||||||
|
gfx_printf("[DEBUG] HorizonOC Restore uebersprungen.\n");
|
||||||
|
install_set_color(COLOR_WHITE);
|
||||||
}
|
}
|
||||||
|
|
||||||
install_check_and_clear_screen_if_needed();
|
install_check_and_clear_screen_if_needed();
|
||||||
// Remove staging directory (installed pack)
|
if (!dbg.skip_update_staging_cleanup) {
|
||||||
res = cleanup_staging_directory(pack_variant);
|
res = cleanup_staging_directory(pack_variant);
|
||||||
if (res != FR_OK) return res;
|
if (res != FR_OK) return res;
|
||||||
// Remove other detected install directories (Standard/Light/OC) that were on SD
|
|
||||||
res = cleanup_other_staging_directories(pack_variant);
|
res = cleanup_other_staging_directories(pack_variant);
|
||||||
return res;
|
return res;
|
||||||
} else {
|
}
|
||||||
// Clean mode: backup, wipe, restore, install
|
install_set_color(COLOR_ORANGE);
|
||||||
|
gfx_printf("[DEBUG] Staging-Aufraeumen uebersprungen.\n");
|
||||||
|
install_set_color(COLOR_WHITE);
|
||||||
|
return FR_OK;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!dbg.skip_clean_backup) {
|
||||||
install_set_color(COLOR_YELLOW);
|
install_set_color(COLOR_YELLOW);
|
||||||
gfx_printf("Schritt 1: Sichere Benutzerdaten...\n");
|
gfx_printf("Schritt 1: Sichere Benutzerdaten...\n");
|
||||||
install_set_color(COLOR_WHITE);
|
install_set_color(COLOR_WHITE);
|
||||||
res = clean_mode_backup();
|
res = clean_mode_backup();
|
||||||
if (res != FR_OK) return res;
|
if (res != FR_OK) return res;
|
||||||
|
} else {
|
||||||
|
install_set_color(COLOR_ORANGE);
|
||||||
|
gfx_printf("[DEBUG] Schritt 1 (Backup) uebersprungen.\n");
|
||||||
|
install_set_color(COLOR_WHITE);
|
||||||
|
}
|
||||||
|
|
||||||
install_check_and_clear_screen_if_needed();
|
install_check_and_clear_screen_if_needed();
|
||||||
gfx_printf("\n");
|
gfx_printf("\n");
|
||||||
|
|
||||||
|
if (!dbg.skip_clean_wipe) {
|
||||||
install_set_color(COLOR_YELLOW);
|
install_set_color(COLOR_YELLOW);
|
||||||
gfx_printf("Schritt 2: Bereinige alte Installation...\n");
|
gfx_printf("Schritt 2: Bereinige alte Installation...\n");
|
||||||
install_set_color(COLOR_WHITE);
|
install_set_color(COLOR_WHITE);
|
||||||
res = clean_mode_wipe();
|
res = clean_mode_wipe();
|
||||||
if (res != FR_OK) return res;
|
if (res != FR_OK) return res;
|
||||||
|
} else {
|
||||||
|
install_set_color(COLOR_ORANGE);
|
||||||
|
gfx_printf("[DEBUG] Schritt 2 (Bereinigung) uebersprungen.\n");
|
||||||
|
install_set_color(COLOR_WHITE);
|
||||||
|
}
|
||||||
|
|
||||||
install_check_and_clear_screen_if_needed();
|
install_check_and_clear_screen_if_needed();
|
||||||
gfx_printf("\n");
|
gfx_printf("\n");
|
||||||
|
|
||||||
|
if (!dbg.skip_clean_restore) {
|
||||||
install_set_color(COLOR_YELLOW);
|
install_set_color(COLOR_YELLOW);
|
||||||
gfx_printf("Schritt 3: Stelle Benutzerdaten wieder her...\n");
|
gfx_printf("Schritt 3: Stelle Benutzerdaten wieder her...\n");
|
||||||
install_set_color(COLOR_WHITE);
|
install_set_color(COLOR_WHITE);
|
||||||
res = clean_mode_restore();
|
res = clean_mode_restore();
|
||||||
if (res != FR_OK) return res;
|
if (res != FR_OK) return res;
|
||||||
|
} else {
|
||||||
|
install_set_color(COLOR_ORANGE);
|
||||||
|
gfx_printf("[DEBUG] Schritt 3 (Restore) uebersprungen.\n");
|
||||||
|
install_set_color(COLOR_WHITE);
|
||||||
|
}
|
||||||
|
|
||||||
install_check_and_clear_screen_if_needed();
|
install_check_and_clear_screen_if_needed();
|
||||||
gfx_printf("\n");
|
gfx_printf("\n");
|
||||||
|
|
||||||
|
if (!dbg.skip_clean_install) {
|
||||||
install_set_color(COLOR_YELLOW);
|
install_set_color(COLOR_YELLOW);
|
||||||
gfx_printf("Schritt 4: Dateien kopieren...\n");
|
gfx_printf("Schritt 4: Dateien kopieren...\n");
|
||||||
install_set_color(COLOR_WHITE);
|
install_set_color(COLOR_WHITE);
|
||||||
res = clean_mode_install(pack_variant);
|
res = clean_mode_install(pack_variant);
|
||||||
if (res != FR_OK) return res;
|
if (res != FR_OK) return res;
|
||||||
|
} else {
|
||||||
|
install_set_color(COLOR_ORANGE);
|
||||||
|
gfx_printf("[DEBUG] Schritt 4 (Kopieren) uebersprungen.\n");
|
||||||
|
install_set_color(COLOR_WHITE);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!dbg.skip_hekate_8gb_post_copy)
|
||||||
install_hekate_8gb_post_copy();
|
install_hekate_8gb_post_copy();
|
||||||
|
else {
|
||||||
|
install_set_color(COLOR_ORANGE);
|
||||||
|
gfx_printf("[DEBUG] hekate 8GB Post-Copy uebersprungen.\n");
|
||||||
|
install_set_color(COLOR_WHITE);
|
||||||
|
}
|
||||||
|
|
||||||
install_check_and_clear_screen_if_needed();
|
install_check_and_clear_screen_if_needed();
|
||||||
// Remove staging directory (installed pack)
|
if (!dbg.skip_clean_staging_cleanup) {
|
||||||
res = cleanup_staging_directory(pack_variant);
|
res = cleanup_staging_directory(pack_variant);
|
||||||
if (res != FR_OK) return res;
|
if (res != FR_OK) return res;
|
||||||
// Remove other detected install directories (Standard/Light/OC) that were on SD
|
|
||||||
res = cleanup_other_staging_directories(pack_variant);
|
res = cleanup_other_staging_directories(pack_variant);
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
install_set_color(COLOR_ORANGE);
|
||||||
|
gfx_printf("[DEBUG] Staging-Aufraeumen uebersprungen.\n");
|
||||||
|
install_set_color(COLOR_WHITE);
|
||||||
|
return FR_OK;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ typedef enum {
|
|||||||
// If a sub-menu aborts to Hekate / update.bin (does not return if launch succeeds)
|
// If a sub-menu aborts to Hekate / update.bin (does not return if launch succeeds)
|
||||||
void installer_launch_hekate_payload(void);
|
void installer_launch_hekate_payload(void);
|
||||||
|
|
||||||
// Main installation function
|
// Main installation function (optional debug: see DEBUG_INI.md in repo root)
|
||||||
int perform_installation(omninx_variant_t pack_variant, install_mode_t mode);
|
int perform_installation(omninx_variant_t pack_variant, install_mode_t mode);
|
||||||
|
|
||||||
// Update mode operations (install_update.c)
|
// Update mode operations (install_update.c)
|
||||||
|
|||||||
@@ -34,7 +34,7 @@
|
|||||||
// Clean mode: Backup user data
|
// Clean mode: Backup user data
|
||||||
int clean_mode_backup(void) {
|
int clean_mode_backup(void) {
|
||||||
set_color(COLOR_CYAN);
|
set_color(COLOR_CYAN);
|
||||||
gfx_printf(" Sichere: DBI, Tinfoil, prod.keys\n");
|
gfx_printf(" Sichere: DBI (dbi.config), prod.keys\n");
|
||||||
set_color(COLOR_WHITE);
|
set_color(COLOR_WHITE);
|
||||||
int res = backup_user_data();
|
int res = backup_user_data();
|
||||||
if (res == FR_OK) {
|
if (res == FR_OK) {
|
||||||
@@ -95,7 +95,7 @@ int clean_mode_wipe(void) {
|
|||||||
// Clean mode: Restore user data
|
// Clean mode: Restore user data
|
||||||
int clean_mode_restore(void) {
|
int clean_mode_restore(void) {
|
||||||
set_color(COLOR_CYAN);
|
set_color(COLOR_CYAN);
|
||||||
gfx_printf(" Stelle wieder her: DBI, Tinfoil, prod.keys\n");
|
gfx_printf(" Stelle wieder her: DBI (dbi.config), prod.keys\n");
|
||||||
set_color(COLOR_WHITE);
|
set_color(COLOR_WHITE);
|
||||||
int res = restore_user_data();
|
int res = restore_user_data();
|
||||||
if (res == FR_OK) {
|
if (res == FR_OK) {
|
||||||
|
|||||||
Reference in New Issue
Block a user