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

hdd-menu: hide mmcblk devices from hdd-menu

Browse Source 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 20d3cd3d2a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-07 (Sat, 07 Oct 2017)

Origin message was:
------------------
- hdd-menu: hide mmcblk devices from hdd-menu

Signed-off-by: Thilo Graf <dbt@novatux.de>


------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-10-07 20:52:38 +02:00
committed by Thilo Graf
parent 461b16b1be
commit 4d8fa7fdfd
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/gui/hdd_menu.cpp
View File

@@ -127,8 +127,11 @@ CHDDMenuHandler* CHDDMenuHandler::getInstance()
int CHDDMenuHandler::filterDevName(const char * name) int CHDDMenuHandler::filterDevName(const char * name)
{ {
if (((name[0] == 's' || name[0] == 'h') && (name[1] == 'd' || name[1] == 'r')) || if (((name[0] == 's' || name[0] == 'h') && (name[1] == 'd' || name[1] == 'r'))
!strncmp(name, "mmcblk", 6)) #if !HAVE_ARM_HARDWARE
|| !strncmp(name, "mmcblk", 6)
#endif
)
return 1; return 1;
return 0; return 0;
} }
@@ -210,6 +213,10 @@ void CHDDMenuHandler::getBlkIds()
hdd_s hdd; hdd_s hdd;
hdd.devname = std::string(buff + 5); hdd.devname = std::string(buff + 5);
#if HAVE_ARM_HARDWARE
if (strncmp(hdd.devname.c_str(), "mmcblk", 6) == 0)
continue;
#endif
hdd.mounted = is_mounted(buff + 5); hdd.mounted = is_mounted(buff + 5);
hdd.fmt = ret; hdd.fmt = ret;
hdd.desc = hdd.devname + " (" + hdd.fmt + ")"; hdd.desc = hdd.devname + " (" + hdd.fmt + ")";