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

Merge branch 'master' into pu/fb-modules

Browse Source
This commit is contained in:
M. Liebmann
2017-02-12 09:24:08 +01:00
parent 9fdbe0bc68 0d66899cbd
commit 0cb26e6e98
32 changed files with 112 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/system/flashtool.cpp
View File

@@ -177,7 +177,7 @@ bool CFlashTool::program( const std::string & filename, int globalProgressEndEra
std::string flashfile;
bool skipCopy = false;
#ifdef BOXMODEL_APOLLO
#ifdef BOXMODEL_CS_HD2
if (strcmp(dn, "/tmp") != 0) {
uint64_t btotal = 0, bused = 0;
long bsize = 0;
@@ -684,7 +684,7 @@ int CMTDInfo::getMTDEraseSize( const std::string & filename )
std::string CMTDInfo::findMTDsystem()
{
#ifdef BOXMODEL_APOLLO
#ifdef BOXMODEL_CS_HD2
std::string sysfs = "root0";
#else
std::string sysfs = "systemFS";