mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-27 07:23:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

- update: ask for copy settings to new image

Browse Source 
Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
svenhoefer
2017-10-27 13:17:17 +02:00
committed by Thilo Graf
parent 68d8319d2d
commit 4a5adfcb23
5 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
data/locale/deutsch.locale
View File

@@ -605,6 +605,7 @@ flashupdate.checkupdate_internet Online-Update
flashupdate.checkupdate_local Lokales Update flashupdate.checkupdate_local Lokales Update
flashupdate.choose_partition Partition wählen flashupdate.choose_partition Partition wählen
flashupdate.copy_image Kopiere Image in den Arbeitsspeicher flashupdate.copy_image Kopiere Image in den Arbeitsspeicher
flashupdate.copy_settings Einstellungen ins neue Image übernehmen?
flashupdate.createimage Image speichern flashupdate.createimage Image speichern
flashupdate.createimage_add_env 'env' hinzufügen flashupdate.createimage_add_env 'env' hinzufügen
flashupdate.createimage_add_kernel 'kernel' hinzufügen flashupdate.createimage_add_kernel 'kernel' hinzufügen

1
data/locale/english.locale
View File

@@ -605,6 +605,7 @@ flashupdate.checkupdate_internet Online update
flashupdate.checkupdate_local Local update flashupdate.checkupdate_local Local update
flashupdate.choose_partition Choose partition flashupdate.choose_partition Choose partition
flashupdate.copy_image Copy Image to main memory flashupdate.copy_image Copy Image to main memory
flashupdate.copy_settings Copy settings to new image?
flashupdate.createimage Save image flashupdate.createimage Save image
flashupdate.createimage_add_env Add 'env' to image flashupdate.createimage_add_env Add 'env' to image
flashupdate.createimage_add_kernel Add 'kernel' to image flashupdate.createimage_add_kernel Add 'kernel' to image

15
src/gui/update.cpp
View File

@@ -621,6 +621,21 @@ int CFlashUpdate::exec(CMenuTarget* parent, const std::string &actionKey)
{ {
showGlobalStatus(100); showGlobalStatus(100);
// create settings package
int copy_settings = ShowMsg(LOCALE_MESSAGEBOX_INFO, LOCALE_FLASHUPDATE_COPY_SETTINGS, CMsgBox::mbrYes, CMsgBox::mbYes | CMsgBox::mbNo, NEUTRINO_ICON_UPDATE);
if (copy_settings == CMsgBox::mbrYes)
{
CHintBox hintBox(LOCALE_MESSAGEBOX_INFO, LOCALE_SETTINGS_BACKUP);
hintBox.paint();
/*
Settings tarball is created in /tmp directory.
ofgwrite will copy this tarball to new rootfs.
It's untared at first start of new image.
*/
my_system(3, "/bin/backup.sh", "/tmp", "backup_flash.tar.gz");
hintBox.hide();
}
// get active partition // get active partition
char c[2] = {0}; char c[2] = {0};
FILE *f; FILE *f;

1
src/system/locals.h
View File

@@ -632,6 +632,7 @@ typedef enum
LOCALE_FLASHUPDATE_CHECKUPDATE_LOCAL, LOCALE_FLASHUPDATE_CHECKUPDATE_LOCAL,
LOCALE_FLASHUPDATE_CHOOSE_PARTITION, LOCALE_FLASHUPDATE_CHOOSE_PARTITION,
LOCALE_FLASHUPDATE_COPY_IMAGE, LOCALE_FLASHUPDATE_COPY_IMAGE,
LOCALE_FLASHUPDATE_COPY_SETTINGS,
LOCALE_FLASHUPDATE_CREATEIMAGE, LOCALE_FLASHUPDATE_CREATEIMAGE,
LOCALE_FLASHUPDATE_CREATEIMAGE_ADD_ENV, LOCALE_FLASHUPDATE_CREATEIMAGE_ADD_ENV,
LOCALE_FLASHUPDATE_CREATEIMAGE_ADD_KERNEL, LOCALE_FLASHUPDATE_CREATEIMAGE_ADD_KERNEL,

1
src/system/locals_intern.h
View File

@@ -632,6 +632,7 @@ const char * locale_real_names[] =
"flashupdate.checkupdate_local", "flashupdate.checkupdate_local",
"flashupdate.choose_partition", "flashupdate.choose_partition",
"flashupdate.copy_image", "flashupdate.copy_image",
"flashupdate.copy_settings",
"flashupdate.createimage", "flashupdate.createimage",
"flashupdate.createimage_add_env", "flashupdate.createimage_add_env",
"flashupdate.createimage_add_kernel", "flashupdate.createimage_add_kernel",