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

gui/hdd_menu.cpp: disable 1min sleep option;

Browse Source 
fix restore hotplug for mdev system


Origin commit data
------------------
Branch: ni/coolstream
Commit: 8020de8bfe
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-02-12 (Wed, 12 Feb 2014)



------------------
This commit was generated by Migit
This commit is contained in:
[CST] Focus
2014-02-12 16:27:12 +04:00
parent 5bad92c99b
commit b6ad82bf2b
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/gui/hdd_menu.cpp
View File

@@ -75,7 +75,7 @@ const CMenuOptionChooser::keyval HDD_FILESYS_OPTIONS[HDD_FILESYS_OPTION_COUNT] =
const CMenuOptionChooser::keyval HDD_SLEEP_OPTIONS[HDD_SLEEP_OPTION_COUNT] = const CMenuOptionChooser::keyval HDD_SLEEP_OPTIONS[HDD_SLEEP_OPTION_COUNT] =
{ {
{ 0, LOCALE_OPTIONS_OFF }, { 0, LOCALE_OPTIONS_OFF },
{ 12, LOCALE_HDD_1MIN }, //{ 12, LOCALE_HDD_1MIN },
{ 60, LOCALE_HDD_5MIN }, { 60, LOCALE_HDD_5MIN },
{ 120, LOCALE_HDD_10MIN }, { 120, LOCALE_HDD_10MIN },
{ 240, LOCALE_HDD_20MIN }, { 240, LOCALE_HDD_20MIN },
@@ -277,6 +277,9 @@ int CHDDDestExec::exec(CMenuTarget* /*parent*/, const std::string&)
const char hdidle[] = "/sbin/hd-idle"; const char hdidle[] = "/sbin/hd-idle";
bool have_hdidle = !access(hdidle, X_OK); bool have_hdidle = !access(hdidle, X_OK);
if (g_settings.hdd_sleep < 60)
g_settings.hdd_sleep = 60;
if (have_hdidle) { 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;
@@ -516,7 +519,11 @@ _remount:
} }
f = fopen("/proc/sys/kernel/hotplug", "w"); f = fopen("/proc/sys/kernel/hotplug", "w");
if(f) { if(f) {
#ifdef ASSUME_MDEV
fprintf(f, "/sbin/mdev\n");
#else
fprintf(f, "/sbin/hotplug\n"); fprintf(f, "/sbin/hotplug\n");
#endif
fclose(f); fclose(f);
} }