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

compil fix withot mdev

Browse Source
This commit is contained in:
Jacek Jendrzej
2014-04-15 15:57:20 +02:00
parent 758f3535c8
commit b58e9b612c
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/gui/hdd_menu.cpp
View File

@@ -267,9 +267,9 @@ bool CHDDMenuHandler::umount_all(std::string dev)
return ret; return ret;
} }
#ifdef ASSUME_MDEV
bool CHDDMenuHandler::add_dev(std::string dev, std::string part) bool CHDDMenuHandler::add_dev(std::string dev, std::string part)
{ {
#ifdef ASSUME_MDEV
std::string filename = "/sys/block/" + dev + "/" + dev + part + "/uevent"; std::string filename = "/sys/block/" + dev + "/" + dev + part + "/uevent";
if (!access(filename.c_str(), W_OK)) { if (!access(filename.c_str(), W_OK)) {
FILE *f = fopen(filename.c_str(), "w"); FILE *f = fopen(filename.c_str(), "w");
@@ -282,14 +282,13 @@ bool CHDDMenuHandler::add_dev(std::string dev, std::string part)
return true; return true;
} }
} }
#endif
return false; return false;
} }
#endif
#ifdef ASSUME_MDEV
bool CHDDMenuHandler::waitfordev(std::string dev, int maxwait) bool CHDDMenuHandler::waitfordev(std::string dev, int maxwait)
{ {
int ret = true; int ret = true;
#ifdef ASSUME_MDEV
int waitcount = 0; int waitcount = 0;
/* wait for the device to show up... */ /* wait for the device to show up... */
while (access(dev.c_str(), W_OK)) { while (access(dev.c_str(), W_OK)) {
@@ -308,9 +307,9 @@ bool CHDDMenuHandler::waitfordev(std::string dev, int maxwait)
} }
if (waitcount && waitcount <= maxwait) if (waitcount && waitcount <= maxwait)
printf("\n"); printf("\n");
#endif
return ret; return ret;
} }
#endif
int CHDDMenuHandler::exec(CMenuTarget* parent, const std::string &actionkey) int CHDDMenuHandler::exec(CMenuTarget* parent, const std::string &actionkey)
{ {
@@ -685,9 +684,10 @@ int CHDDMenuHandler::formatDevice(std::string dev)
goto _return; goto _return;
} }
sleep(2); sleep(2);
#ifdef ASSUME_MDEV
add_dev(dev, part); add_dev(dev, part);
waitfordev(devname + part, 30); waitfordev(devname + part, 30);
#endif
f = popen(mkfscmd.c_str(), "r"); f = popen(mkfscmd.c_str(), "r");
if (!f) { if (!f) {
showError(LOCALE_HDD_FORMAT_FAILED); showError(LOCALE_HDD_FORMAT_FAILED);