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

gui/hdd_menu: Permit AAM if hd-idle is installed, but don't show the configuration option if there's only the busybox hdparm variant available.

Browse Source 
Signed-off-by: Jacek Jendrzej <crashdvb@googlemail.com>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4b44d47acf
Author: martii <m4rtii@gmx.de>
Date: 2013-12-24 (Tue, 24 Dec 2013)



------------------
This commit was generated by Migit
This commit is contained in:
martii
2013-12-24 16:17:47 +01:00
committed by Jacek Jendrzej
parent 8e1a9840a6
commit b9ca74d7c7
1 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/gui/hdd_menu.cpp
View File

@@ -147,9 +147,18 @@ int CHDDMenuHandler::doMenu ()
mc->setHint("", LOCALE_MENU_HINT_HDD_SLEEP); mc->setHint("", LOCALE_MENU_HINT_HDD_SLEEP);
hddmenu->addItem(mc); hddmenu->addItem(mc);
mc = new CMenuOptionChooser(LOCALE_HDD_NOISE, &g_settings.hdd_noise, HDD_NOISE_OPTIONS, HDD_NOISE_OPTION_COUNT, true); const char hdparm[] = "/sbin/hdparm";
mc->setHint("", LOCALE_MENU_HINT_HDD_NOISE); bool hdparm_link = false;
hddmenu->addItem(mc); struct stat stat_buf;
if(::lstat(hdparm, &stat_buf) == 0)
if( S_ISLNK(stat_buf.st_mode) )
hdparm_link = true;
if (!hdparm_link) {
mc = new CMenuOptionChooser(LOCALE_HDD_NOISE, &g_settings.hdd_noise, HDD_NOISE_OPTIONS, HDD_NOISE_OPTION_COUNT, true);
mc->setHint("", LOCALE_MENU_HINT_HDD_NOISE);
hddmenu->addItem(mc);
}
//if(n > 0) //if(n > 0)
hddmenu->addItem(new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_HDD_MANAGE)); hddmenu->addItem(new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_HDD_MANAGE));
@@ -271,7 +280,10 @@ int CHDDDestExec::exec(CMenuTarget* /*parent*/, const std::string&)
if (n < 0) if (n < 0)
return 0; return 0;
if (!access("/sbin/hd-idle", X_OK)) { const char hdidle[] = "/sbin/hd-idle";
bool have_hdidle = !access(hdidle, X_OK);
if (have_hdidle) {
system("kill $(pidof hd-idle)"); system("kill $(pidof hd-idle)");
int sleep_seconds = g_settings.hdd_sleep; int sleep_seconds = g_settings.hdd_sleep;
switch (sleep_seconds) { switch (sleep_seconds) {
@@ -285,8 +297,7 @@ int CHDDDestExec::exec(CMenuTarget* /*parent*/, const std::string&)
sleep_seconds *= 5; sleep_seconds *= 5;
} }
if (sleep_seconds) if (sleep_seconds)
my_system(3, "/sbin/hd-idle", "-i", to_string(sleep_seconds).c_str()); my_system(3, hdidle, "-i", to_string(sleep_seconds).c_str());
return 1;
} }
const char hdparm[] = "/sbin/hdparm"; const char hdparm[] = "/sbin/hdparm";
@@ -302,10 +313,13 @@ int CHDDDestExec::exec(CMenuTarget* /*parent*/, const std::string&)
snprintf(S_opt, sizeof(S_opt),"-S%d", g_settings.hdd_sleep); snprintf(S_opt, sizeof(S_opt),"-S%d", g_settings.hdd_sleep);
snprintf(opt, sizeof(opt),"/dev/%s",namelist[i]->d_name); snprintf(opt, sizeof(opt),"/dev/%s",namelist[i]->d_name);
if(hdparm_link){ if (have_hdidle) {
snprintf(M_opt, sizeof(M_opt), "-M%d", g_settings.hdd_noise);
my_system(3, hdparm, M_opt, opt);
} else if(hdparm_link) {
//hdparm -M is not included in busybox hdparm! //hdparm -M is not included in busybox hdparm!
my_system(3, hdparm, S_opt, opt); my_system(3, hdparm, S_opt, opt);
}else{ } else {
snprintf(M_opt, sizeof(M_opt),"-M%d", g_settings.hdd_noise); snprintf(M_opt, sizeof(M_opt),"-M%d", g_settings.hdd_noise);
my_system(4, hdparm, M_opt, S_opt, opt); my_system(4, hdparm, M_opt, S_opt, opt);
} }