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

Merge remote-tracking branch 'tuxbox/master'

Browse Source 
Origin commit data
------------------
Commit: 8b47699447
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-11 (Sat, 11 Feb 2017)
This commit is contained in:
Stefan Seyfried
2017-02-11 11:18:45 +01:00
parent be4f4438aa 2f3330a736
commit 706a5ba010
32 changed files with 217 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/gui/hdd_menu.cpp
View File

@@ -1356,12 +1356,12 @@ int CHDDDestExec::exec(CMenuTarget* /*parent*/, const std::string&)
if (n < 0)
return menu_return::RETURN_NONE;
const char hdidle[] = "/sbin/hd-idle";
bool have_hdidle = !access(hdidle, X_OK);
if (g_settings.hdd_sleep > 0 && g_settings.hdd_sleep < 60)
g_settings.hdd_sleep = 60;
const char hdidle[] = "/sbin/hd-idle";
bool have_hdidle = !access(hdidle, X_OK);
if (have_hdidle) {
system("kill $(pidof hd-idle)");
int sleep_seconds = g_settings.hdd_sleep;
@@ -1377,12 +1377,22 @@ int CHDDDestExec::exec(CMenuTarget* /*parent*/, const std::string&)
}
if (sleep_seconds)
my_system(3, hdidle, "-i", to_string(sleep_seconds).c_str());
while (n--)
free(namelist[n]);
free(namelist);
return menu_return::RETURN_NONE;
}
const char hdparm[] = "/sbin/hdparm";
bool have_hdparm = !access(hdparm, X_OK);
if (!have_hdparm)
{
while (n--)
free(namelist[n]);
free(namelist);
return menu_return::RETURN_NONE;
}
struct stat stat_buf;
bool have_nonbb_hdparm = !::lstat(hdparm, &stat_buf) && !S_ISLNK(stat_buf.st_mode);
@@ -1396,12 +1406,11 @@ int CHDDDestExec::exec(CMenuTarget* /*parent*/, const std::string&)
snprintf(M_opt, sizeof(M_opt), "-M%d", g_settings.hdd_noise);
snprintf(opt, sizeof(opt), "/dev/%s",namelist[i]->d_name);
if (have_hdidle)
my_system(3, hdparm, M_opt, opt);
else if (have_nonbb_hdparm)
if (have_nonbb_hdparm)
my_system(4, hdparm, M_opt, S_opt, opt);
else // busybox hdparm doesn't support "-M"
my_system(3, hdparm, S_opt, opt);
free(namelist[i]);
}
free(namelist);