mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-03 10:51:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Image backup apollo Part #6

Browse Source 
- Menu option for including kernel/uldr/u-boot in the image backup
- Menu option for creating an image with a different erasesize
  Tank <=> Trinity
This commit is contained in:
Michael Liebmann
2013-09-24 23:22:25 +02:00
parent 9188c78751
commit d00cb6f8ec
10 changed files with 252 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/system/locals.h
View File

@@ -493,6 +493,16 @@ typedef enum
LOCALE_FLASHUPDATE_CANTOPENMTD,
LOCALE_FLASHUPDATE_CHECKUPDATE_INTERNET,
LOCALE_FLASHUPDATE_CHECKUPDATE_LOCAL,
LOCALE_FLASHUPDATE_CREATEIMAGE,
LOCALE_FLASHUPDATE_CREATEIMAGE_ADD_ENV,
LOCALE_FLASHUPDATE_CREATEIMAGE_ADD_KERNEL,
LOCALE_FLASHUPDATE_CREATEIMAGE_ADD_SPARE,
LOCALE_FLASHUPDATE_CREATEIMAGE_ADD_U_BOOT,
LOCALE_FLASHUPDATE_CREATEIMAGE_ADD_ULDR,
LOCALE_FLASHUPDATE_CREATEIMAGE_MENU,
LOCALE_FLASHUPDATE_CREATEIMAGE_OPTIONS,
LOCALE_FLASHUPDATE_CREATEIMAGE_OTHER,
LOCALE_FLASHUPDATE_CREATEIMAGE_WARNING,
LOCALE_FLASHUPDATE_CURRENTVERSION_SEP,
LOCALE_FLASHUPDATE_CURRENTVERSIONDATE,
LOCALE_FLASHUPDATE_CURRENTVERSIONTIME,

10
src/system/locals_intern.h
View File

@@ -493,6 +493,16 @@ const char * locale_real_names[] =
"flashupdate.cantopenmtd",
"flashupdate.checkupdate_internet",
"flashupdate.checkupdate_local",
"flashupdate.createimage",
"flashupdate.createimage_add_env",
"flashupdate.createimage_add_kernel",
"flashupdate.createimage_add_spare",
"flashupdate.createimage_add_u_boot",
"flashupdate.createimage_add_uldr",
"flashupdate.createimage_menu",
"flashupdate.createimage_options",
"flashupdate.createimage_other",
"flashupdate.createimage_warning",
"flashupdate.currentversion_sep",
"flashupdate.currentversiondate",
"flashupdate.currentversiontime",

2
src/system/mtdutils/mkfs.jffs2.cpp
View File

@@ -1162,7 +1162,7 @@ bool CMkfsJFFS2::makeJffs2Image(std::string& path,
progressBar = progress;
hardlinks.rb_node = NULL;
// printf("[%s] erase_block_size: 0x%X\n", __FUNCTION__, eraseBlockSize);
printf("[%s] erase_block_size: 0x%X\n", __FUNCTION__, eraseBlockSize);
classInit();
char *cwd;

6
src/system/settings.h
View File

@@ -482,6 +482,12 @@ struct SNeutrinoSettings
int apply_settings;
int apply_kernel;
int flashupdate_createimage_add_uldr;
int flashupdate_createimage_add_u_boot;
int flashupdate_createimage_add_env;
int flashupdate_createimage_add_spare;
int flashupdate_createimage_add_kernel;
//BouquetHandling
int bouquetlist_mode;