mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-29 00:11:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

Software update: Rework preparing the flash process

Browse Source 
- Finish all unnecessary threads and processes before the flash process
- Use flash.start to stop other (user-defined) processes


Origin commit data
------------------
Commit: c26fd64759
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-06-08 (Sat, 08 Jun 2013)

Origin message was:
------------------
* Software update: Rework preparing the flash process

- Finish all unnecessary threads and processes before the flash process
- Use flash.start to stop other (user-defined) processes
This commit is contained in:
Michael Liebmann
2013-06-08 14:45:26 +02:00
parent ed0c31f657
commit 4987f7ef5b
10 changed files with 81 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/gui/update_ext.cpp
View File

@@ -62,8 +62,6 @@ CExtUpdate::CExtUpdate()
imgFilename = "";
mtdRamError = "";
mtdNumber = -1;
MTDBufSize = 0xFFFF;
MTDBuf = new char[MTDBufSize];
backupList = CONFIGDIR "/settingsupdate.conf";
defaultBackup = CONFIGDIR;
@@ -84,8 +82,6 @@ CExtUpdate::CExtUpdate()
CExtUpdate::~CExtUpdate()
{
if (MTDBuf != NULL)
delete[] MTDBuf;
if(FileHelpers)
delete[] FileHelpers;
copyList.clear();
@@ -107,7 +103,7 @@ bool CExtUpdate::ErrorReset(bool modus, const std::string & msg1, const std::str
if (modus & RESET_UNLOAD) {
umount(mountPkt.c_str());
my_system(2,"rmmod", mtdramDriver.c_str());
// my_system(2,"rmmod", mtdramDriver.c_str());
}
if (modus & RESET_FD1)
close(fd1);
@@ -272,6 +268,8 @@ bool CExtUpdate::applySettings()
}
}
int MTDBufSize = 0xFFFF;
char *MTDBuf = new char[MTDBufSize];
// copy image to mtdblock
if (MTDBuf == NULL)
return ErrorReset(RESET_UNLOAD, "malloc error");
@@ -362,6 +360,8 @@ bool CExtUpdate::applySettings()
if(hintBox)
hintBox->hide();
delete[] MTDBuf;
MTDBuf = NULL;
sync();
return true;
}