mirror of
https://github.com/tuxbox-neutrino/neutrino.git
synced 2025-08-27 15:32:59 +02:00
- rename BOXMODEL_CS => BOXMODEL_CST
Conflicts: data/scripts/Makefile.am src/gui/cam_menu.cpp src/gui/imageinfo_ni.cpp src/gui/osd_setup.cpp src/gui/update.cpp src/gui/update.h src/gui/update_menue.cpp src/neutrino.cpp src/system/setting_helpers.cpp Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
@@ -187,7 +187,7 @@ bool CFlashTool::program( const std::string & filename, int globalProgressEndEra
|
||||
std::string flashfile;
|
||||
|
||||
bool skipCopy = false;
|
||||
#ifdef BOXMODEL_CS_HD2
|
||||
#ifdef BOXMODEL_CST_HD2
|
||||
if (strcmp(dn, "/tmp") != 0) {
|
||||
uint64_t btotal = 0, bused = 0;
|
||||
long bsize = 0;
|
||||
@@ -697,7 +697,7 @@ int CMTDInfo::getMTDEraseSize( const std::string & filename )
|
||||
|
||||
std::string CMTDInfo::findMTDsystem()
|
||||
{
|
||||
#ifdef BOXMODEL_CS_HD2
|
||||
#ifdef BOXMODEL_CST_HD2
|
||||
std::string sysfs = "root0";
|
||||
#else
|
||||
std::string sysfs = "systemFS";
|
||||
|
Reference in New Issue
Block a user