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

Merge remote-tracking branch 'check/next-cc'

Browse Source 
...only build-tested, needs fixes


Origin commit data
------------------
Branch: ni/coolstream
Commit: ecd62d81d1
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-02-15 (Sat, 15 Feb 2014)



------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2014-02-15 20:22:07 +01:00
parent 55608c905f b0dfcd11ed
commit 59b887d87a
77 changed files with 1056 additions and 396 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/gui/hdd_menu.cpp
View File

@@ -74,11 +74,11 @@ const CMenuOptionChooser::keyval HDD_FILESYS_OPTIONS[HDD_FILESYS_OPTION_COUNT] =
{ 1, LOCALE_HDD_REISER },
{ 2, LOCALE_OPTIONS_OFF }
};
#define HDD_SLEEP_OPTION_COUNT 7
#define HDD_SLEEP_OPTION_COUNT 6
const CMenuOptionChooser::keyval HDD_SLEEP_OPTIONS[HDD_SLEEP_OPTION_COUNT] =
{
{ 0, LOCALE_OPTIONS_OFF },
{ 12, LOCALE_HDD_1MIN },
//{ 12, LOCALE_HDD_1MIN },
{ 60, LOCALE_HDD_5MIN },
{ 120, LOCALE_HDD_10MIN },
{ 240, LOCALE_HDD_20MIN },
@@ -291,6 +291,9 @@ int CHDDDestExec::exec(CMenuTarget* /*parent*/, const std::string&)
const char hdidle[] = "/sbin/hd-idle";
bool have_hdidle = !access(hdidle, X_OK);
if (g_settings.hdd_sleep < 60)
g_settings.hdd_sleep = 60;
if (have_hdidle) {
system("kill $(pidof hd-idle)");
int sleep_seconds = g_settings.hdd_sleep;
@@ -675,7 +678,11 @@ _remount:
#ifndef ASSUME_MDEV
f = fopen("/proc/sys/kernel/hotplug", "w");
if(f) {
#ifdef ASSUME_MDEV
fprintf(f, "/sbin/mdev\n");
#else
fprintf(f, "/sbin/hotplug\n");
#endif
fclose(f);
}
#else